pool/suse-module-tools
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 332069 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/332069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-module-tools?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2015-10-01 10:20:33 +00:00 committed by Git OBS Bridge
commit ffd069dbbc
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.initrd
View File

@ -4,8 +4,8 @@
# See also fate#313506 # See also fate#313506
%regenerate_initrd_post \ %regenerate_initrd_post \
mkdir -p /var/run/regenerate-initrd/ \ mkdir -p /run/regenerate-initrd/ \
touch /var/run/regenerate-initrd/all \ touch /run/regenerate-initrd/all \
%nil %nil
%regenerate_initrd_posttrans \ %regenerate_initrd_posttrans \

6
regenerate-initrd-posttrans
View File

@ -2,18 +2,18 @@
# #
# Packages that install kernels or kernel-modules create a flag # Packages that install kernels or kernel-modules create a flag
# #
# /var/run/regenerate-initrd/<kernel image> # /run/regenerate-initrd/<kernel image>
# #
# to have the initrd for <kernel image> generated, or # to have the initrd for <kernel image> generated, or
# #
# /var/run/regenerate-initrd/all # /run/regenerate-initrd/all
# #
# to have all initrds generated. This script is called from posttrans # to have all initrds generated. This script is called from posttrans
# and takes care of generating the initrds # and takes care of generating the initrds
shopt -s nullglob shopt -s nullglob
dir=/var/run/regenerate-initrd dir=/run/regenerate-initrd
did_mkinitrd_setup=false did_mkinitrd_setup=false
run_mkinitrd_setup() run_mkinitrd_setup()

9
suse-module-tools.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Sep 8 12:44:33 UTC 2015 - trenn@suse.de
- Use /run instead of deprecated /var/run
This can have sever consequences if this package uses /var/run. It may
be installed before filesystem package generating the /run tmpfs and
predict it to generate the link /var/run -> /run. Later dracut convertfs
kicks in to generate it, but it has issues. bsc#922676
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz

2
suse-module-tools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package suse-module-tools # spec file for package suse-module-tools
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

4
weak-modules2
View File

@ -357,8 +357,8 @@ run_depmod_and_mkinitrd() {
done done
if [ -n "$image" ]; then if [ -n "$image" ]; then
if test -n "$INITRD_IN_POSTTRANS"; then if test -n "$INITRD_IN_POSTTRANS"; then
mkdir -p /var/run/regenerate-initrd mkdir -p /run/regenerate-initrd
touch /var/run/regenerate-initrd/$image-$krel touch /run/regenerate-initrd/$image-$krel
else else
doit /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel doit /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel
status=$? status=$?