Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2019-09-30 15:50:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Mon Sep 30 15:50:17 2019 rev:144 rq:732746 version:049+git112.fe41ccd9
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2019-09-02 12:43:47.429764118 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new.2352/dracut.changes 2019-09-30 15:50:21.218660948 +0200
@@ -1,0 +2,9 @@
+Mon Sep 23 11:37:53 UTC 2019 - daniel.molkentin@suse.com
+
+- Update to version 049+git112.fe41ccd9:
+ * dracut: move /var/run and /var/lock from directory to symlink (bsc#1149103, ECO#323)
+ * 35network-legacy: signalize the setup in ifup when dhcp (bsc#1146661)
+ * 35network-legacy: fix typo
+ * 35network-legacy: install hostname required by ifup.sh (bsc#1146661)
+
+-------------------------------------------------------------------
Old:
----
dracut-049+git108.6c9d1156.obscpio
dracut-049+git108.6c9d1156.tar.xz
New:
----
dracut-049+git112.fe41ccd9.obscpio
dracut-049+git112.fe41ccd9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.WSitYh/_old 2019-09-30 15:50:22.158658447 +0200
+++ /var/tmp/diff_new_pack.WSitYh/_new 2019-09-30 15:50:22.166658425 +0200
@@ -19,7 +19,7 @@
%define dracutlibdir %{_libexecdir}/dracut
Name: dracut
-Version: 049+git108.6c9d1156
+Version: 049+git112.fe41ccd9
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<https://github.com/opensuse/dracut.git</param>
- <param name="changesrevision">6c9d1156d1d2eea7147a76d75a06a676e0de8985</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">fe41ccd97a72ae7d072f463aed8477f32f86eb9e</param></service></servicedata>
\ No newline at end of file
++++++ dracut-049+git108.6c9d1156.obscpio -> dracut-049+git112.fe41ccd9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh
--- old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh 2019-09-23 13:28:06.000000000 +0200
@@ -19,6 +19,9 @@
ROOT=${ROOT%/}
done
+#mount /sysroot rw
+[ -w $ROOT ] || mount -o remount,rw $ROOT
+
if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
echo "Converting /var/run to symlink"
mv -f $ROOT/var/run $ROOT/var/run.runmove~
@@ -31,174 +34,7 @@
ln -sfn ../run/lock $ROOT/var/lock
fi
-needconvert() {
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
- if [[ -e "$dir" ]]; then
- [[ -L "$dir" ]] || return 0
- fi
- done
- return 1
-}
-
-if ! [ -e "$ROOT/usr/bin" ]; then
- echo "$ROOT/usr/bin does not exist!"
- echo "Make sure, the kernel command line has enough information"
- echo "to mount /usr (man dracut.cmdline)"
- exit 1
-fi
-
-
-if ! needconvert; then
- echo "Your system is already converted."
- exit 0
-fi
-
-testfile="$ROOT/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/usr/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-find_mount() {
- local dev mnt etc wanted_dev
- wanted_dev="$(readlink -e -q $1)"
- while read dev mnt etc || [ -n "$dev" ]; do
- [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
- done < /proc/mounts
- return 1
-}
-
-# usage: ismounted <mountpoint>
-# usage: ismounted /dev/<device>
-if command -v findmnt >/dev/null; then
- ismounted() {
- findmnt "$1" > /dev/null 2>&1
- }
-else
- ismounted() {
- if [ -b "$1" ]; then
- find_mount "$1" > /dev/null && return 0
- return 1
- fi
-
- while read a m a || [ -n "$m" ]; do
- [ "$m" = "$1" ] && return 0
- done < /proc/mounts
- return 1
- }
-fi
-
-# clean up after ourselves no matter how we die.
-cleanup() {
- echo "Something failed. Move back to the original state"
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
- "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
- "$ROOT/usr/lib64"; do
- [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
- if [[ -d "${dir}.usrmove-old" ]]; then
- mv "$dir" "${dir}.del~"
- mv "${dir}.usrmove-old" "$dir"
- rm -fr -- "${dir}.del~"
- fi
- done
-}
-
-trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
-trap 'exit 1;' SIGINT
-
-ismounted "$ROOT/usr" || CP_HARDLINK="-l"
-
-set -e
-
-# merge / and /usr in new dir in /usr
-for dir in bin sbin lib lib64; do
- rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Make a copy of \`$ROOT/usr/$dir'."
- [[ -d "$ROOT/usr/$dir" ]] \
- && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Merge the copy with \`$ROOT/$dir'."
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
- || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
- cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Clean up duplicates in \`$ROOT/usr/$dir'."
- # delete all symlinks that have been backed up
- find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
- # replace symlink with backed up binary
- find "$ROOT/usr/${dir}.usrmove-new" \
- -name '*.usrmove~' \
- -type f \
- -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
- [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
-done
-# switch over merged dirs in /usr
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
- echo "Switch to new \`$ROOT/usr/$dir'."
- rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
-done
-
-# replace dirs in / with links to /usr
-for dir in bin sbin lib lib64; do
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Create \`$ROOT/$dir' symlink."
- rm -fr -- "$ROOT/${dir}.usrmove-old" || :
- mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
- ln -sfn usr/$dir "$ROOT/$dir"
-done
-
-echo "Clean up backup files."
-# everything seems to work; cleanup
-for dir in bin sbin lib lib64; do
- # if we get killed in the middle of "rm -rf", ensure not to leave
- # an incomplete directory, which is moved back by cleanup()
- [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
- && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
- [[ -d "$ROOT/${dir}.usrmove-old" ]] \
- && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
-done
-
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
- [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
-done
-
-for dir in lib lib64; do
- [[ -d "$ROOT/$dir" ]] || continue
- for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
- [[ -f $lib ]] || continue
- mv $lib ${lib/.so/_so}
- done
-done
-
-set +e
-
-echo "Run ldconfig."
-ldconfig -r "$ROOT"
-
-. $ROOT/etc/selinux/config
-if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
- echo "Fixing SELinux labels"
- setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
-fi
+[ -w $ROOT ] && mount -o remount,ro $ROOT
echo "Done."
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -523,7 +523,7 @@
fi
# disable manual ifup while netroot is set for simplifying our logic
-# in netroot case we prefer netroot to bringup $netif automaticlly
+# in netroot case we prefer netroot to bringup $netif automatically
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
if [ -n "$manualup" ]; then
@@ -616,6 +616,10 @@
case $autoconf in
dhcp|on|any|dhcp6)
+ > /tmp/net.$netif.did-setup
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
+ > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
;;
*)
if [ $ret -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -4,7 +4,7 @@
check() {
local _program
- require_binaries ip sed awk grep || return 1
+ require_binaries ip sed awk grep hostname || return 1
require_any_binary arping arping2 wicked || return 1
require_any_binary dhclient wicked || return 1
@@ -30,6 +30,7 @@
strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2"
inst_multiple -o wicked
inst_multiple -o ping ping6
+ inst_multiple -o hostname
inst_multiple -o teamd teamdctl teamnl
inst_simple /etc/libnl/classid
inst_script "$moddir/ifup.sh" "/sbin/ifup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/suse/dracut.spec new/dracut-049+git112.fe41ccd9/suse/dracut.spec
--- old/dracut-049+git108.6c9d1156/suse/dracut.spec 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/suse/dracut.spec 2019-09-23 13:28:06.000000000 +0200
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf< dracut-049+git112.fe41ccd9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh
--- old/dracut-049+git108.6c9d1156/modules.d/30convertfs/convertfs.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/30convertfs/convertfs.sh 2019-09-23 13:28:06.000000000 +0200
@@ -19,6 +19,9 @@
ROOT=${ROOT%/}
done
+#mount /sysroot rw
+[ -w $ROOT ] || mount -o remount,rw $ROOT
+
if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
echo "Converting /var/run to symlink"
mv -f $ROOT/var/run $ROOT/var/run.runmove~
@@ -31,174 +34,7 @@
ln -sfn ../run/lock $ROOT/var/lock
fi
-needconvert() {
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
- if [[ -e "$dir" ]]; then
- [[ -L "$dir" ]] || return 0
- fi
- done
- return 1
-}
-
-if ! [ -e "$ROOT/usr/bin" ]; then
- echo "$ROOT/usr/bin does not exist!"
- echo "Make sure, the kernel command line has enough information"
- echo "to mount /usr (man dracut.cmdline)"
- exit 1
-fi
-
-
-if ! needconvert; then
- echo "Your system is already converted."
- exit 0
-fi
-
-testfile="$ROOT/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f -- "$testfile"
-> "$testfile"
-if [[ ! -e "$testfile" ]]; then
- echo "Cannot write to $ROOT/usr/"
- exit 1
-fi
-rm -f -- "$testfile"
-
-find_mount() {
- local dev mnt etc wanted_dev
- wanted_dev="$(readlink -e -q $1)"
- while read dev mnt etc || [ -n "$dev" ]; do
- [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
- done < /proc/mounts
- return 1
-}
-
-# usage: ismounted <mountpoint>
-# usage: ismounted /dev/<device>
-if command -v findmnt >/dev/null; then
- ismounted() {
- findmnt "$1" > /dev/null 2>&1
- }
-else
- ismounted() {
- if [ -b "$1" ]; then
- find_mount "$1" > /dev/null && return 0
- return 1
- fi
-
- while read a m a || [ -n "$m" ]; do
- [ "$m" = "$1" ] && return 0
- done < /proc/mounts
- return 1
- }
-fi
-
-# clean up after ourselves no matter how we die.
-cleanup() {
- echo "Something failed. Move back to the original state"
- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
- "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
- "$ROOT/usr/lib64"; do
- [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
- if [[ -d "${dir}.usrmove-old" ]]; then
- mv "$dir" "${dir}.del~"
- mv "${dir}.usrmove-old" "$dir"
- rm -fr -- "${dir}.del~"
- fi
- done
-}
-
-trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
-trap 'exit 1;' SIGINT
-
-ismounted "$ROOT/usr" || CP_HARDLINK="-l"
-
-set -e
-
-# merge / and /usr in new dir in /usr
-for dir in bin sbin lib lib64; do
- rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Make a copy of \`$ROOT/usr/$dir'."
- [[ -d "$ROOT/usr/$dir" ]] \
- && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Merge the copy with \`$ROOT/$dir'."
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
- || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
- cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
- echo "Clean up duplicates in \`$ROOT/usr/$dir'."
- # delete all symlinks that have been backed up
- find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
- # replace symlink with backed up binary
- find "$ROOT/usr/${dir}.usrmove-new" \
- -name '*.usrmove~' \
- -type f \
- -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
- [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
-done
-# switch over merged dirs in /usr
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
- echo "Switch to new \`$ROOT/usr/$dir'."
- rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
- mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
-done
-
-# replace dirs in / with links to /usr
-for dir in bin sbin lib lib64; do
- [[ -L "$ROOT/$dir" ]] && continue
- [[ -d "$ROOT/$dir" ]] || continue
- echo "Create \`$ROOT/$dir' symlink."
- rm -fr -- "$ROOT/${dir}.usrmove-old" || :
- mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
- ln -sfn usr/$dir "$ROOT/$dir"
-done
-
-echo "Clean up backup files."
-# everything seems to work; cleanup
-for dir in bin sbin lib lib64; do
- # if we get killed in the middle of "rm -rf", ensure not to leave
- # an incomplete directory, which is moved back by cleanup()
- [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
- && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
- [[ -d "$ROOT/${dir}.usrmove-old" ]] \
- && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
-done
-
-for dir in bin sbin lib lib64; do
- [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
- [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
- && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
-done
-
-for dir in lib lib64; do
- [[ -d "$ROOT/$dir" ]] || continue
- for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
- [[ -f $lib ]] || continue
- mv $lib ${lib/.so/_so}
- done
-done
-
-set +e
-
-echo "Run ldconfig."
-ldconfig -r "$ROOT"
-
-. $ROOT/etc/selinux/config
-if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
- echo "Fixing SELinux labels"
- setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
-fi
+[ -w $ROOT ] && mount -o remount,ro $ROOT
echo "Done."
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/ifup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/ifup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -523,7 +523,7 @@
fi
# disable manual ifup while netroot is set for simplifying our logic
-# in netroot case we prefer netroot to bringup $netif automaticlly
+# in netroot case we prefer netroot to bringup $netif automatically
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
if [ -n "$manualup" ]; then
@@ -616,6 +616,10 @@
case $autoconf in
dhcp|on|any|dhcp6)
+ > /tmp/net.$netif.did-setup
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
+ > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
;;
*)
if [ $ret -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh
--- old/dracut-049+git108.6c9d1156/modules.d/35network-legacy/module-setup.sh 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/modules.d/35network-legacy/module-setup.sh 2019-09-23 13:28:06.000000000 +0200
@@ -4,7 +4,7 @@
check() {
local _program
- require_binaries ip sed awk grep || return 1
+ require_binaries ip sed awk grep hostname || return 1
require_any_binary arping arping2 wicked || return 1
require_any_binary dhclient wicked || return 1
@@ -30,6 +30,7 @@
strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2"
inst_multiple -o wicked
inst_multiple -o ping ping6
+ inst_multiple -o hostname
inst_multiple -o teamd teamdctl teamnl
inst_simple /etc/libnl/classid
inst_script "$moddir/ifup.sh" "/sbin/ifup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049+git108.6c9d1156/suse/dracut.spec new/dracut-049+git112.fe41ccd9/suse/dracut.spec
--- old/dracut-049+git108.6c9d1156/suse/dracut.spec 2019-08-26 16:39:23.000000000 +0200
+++ new/dracut-049+git112.fe41ccd9/suse/dracut.spec 2019-09-23 13:28:06.000000000 +0200
@@ -176,6 +176,17 @@
%post
%service_add_post purge-kernels.service
+# check whether /var/run has been converted to a symlink
+[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
+[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<