Removed 017, because 018 fixes bugs which are not going to be backported to

017.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

9 files changed, 0 insertions, 339 deletions

diff --git a/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch b/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch
deleted file mode 100644
index 257032848480..000000000000
--- a/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b6aaac5020cd2e4ee8aaff300ed1a2dbf7bcd6b4 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 Feb 2012 13:21:51 +0100
-Subject: [PATCH 3/4] 30convertfs/convertfs.sh: correct check for /usr/bin
-
----
- modules.d/30convertfs/convertfs.sh |   17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
-index 69c3b3e..aa2c8b1 100755
---- a/modules.d/30convertfs/convertfs.sh
-+++ b/modules.d/30convertfs/convertfs.sh
-@@ -21,13 +21,13 @@ while [[ "$ROOT" != "${ROOT%/}" ]]; do
-     ROOT=${ROOT%/}
- done
- 
--if [ ! -L $ROOT/var/run ]; then
-+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~
-     ln -sfn ../run $ROOT/var/run
- fi
- 
--if [ ! -L $ROOT/var/lock ]; then
-+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
-     echo "Converting /var/lock to symlink"
-     mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
-     ln -sfn ../run/lock $ROOT/var/lock
-@@ -42,16 +42,19 @@ needconvert() {
-     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
- 
--if [ -e "$ROOT/usr/bin" ]; then
--    echo "$ROOT/usr/bin does not exist"
--    exit 1
--fi
--
- testfile="$ROOT/.usrmovecheck$$"
- rm -f "$testfile"
- > "$testfile"
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch b/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch
deleted file mode 100644
index 43572cb4bafe..000000000000
--- a/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a654b70ec172be6de1662011b723ca2ba8afbd64 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 Feb 2012 16:20:02 +0100
-Subject: [PATCH 4/4] 90crypt/parse-crypt.sh: simplify rd.luks.uuid testing
-
----
- modules.d/90crypt/parse-crypt.sh |   15 ++-------------
- 1 files changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
-index 2ab3a9f..f96b59a 100755
---- a/modules.d/90crypt/parse-crypt.sh
-+++ b/modules.d/90crypt/parse-crypt.sh
-@@ -24,21 +24,10 @@ else
-                 printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
-             } >> /etc/udev/rules.d/70-luks.rules.new
- 
--
--            [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \
--            {
--                printf -- 'UUIDS=:\n'
--                printf -- 'for dm in /dev/dm-*; do\n'
--                printf -- '[ -e "$dm" ] || exit 1\n'
--                printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n'
--                printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n'
--                printf -- '[ "x$uuid" = "x$dmid" ] && continue\n'
--                printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n'
--                printf -- 'done\n'
--            } > $hookdir/initqueue/finished/90-crypt.sh
-             uuid=$luksid
-             while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
--            printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh
-+            printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \
-+                >> $hookdir/initqueue/finished/90-crypt.sh
- 
-             {
-                 printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
deleted file mode 100644
index 86ce9010dd9c..000000000000
--- a/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6dd4370eaa5a7e627bbd34535b6779eaa41ae44c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 27 Mar 2012 16:00:28 +0200
-Subject: [PATCH 2/2] 95fstab-sys/mount-sys.sh: removed check for existing
- /dev
-
-there are a lot of filesystems, which do not need an actual device node
----
- modules.d/95fstab-sys/mount-sys.sh |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
-index 8c9cb29..54415d1 100755
---- a/modules.d/95fstab-sys/mount-sys.sh
-+++ b/modules.d/95fstab-sys/mount-sys.sh
-@@ -11,10 +11,6 @@ fstab_mount() {
-     info "Mounting from $1"
-     while read _dev _mp _fs _opts _dump _pass _rest; do
-         [ -z "${_dev%%#*}" ] && continue # Skip comment lines
--        if [[ ! "$_fs" =~ "nfs" ]] && [ ! -e "$_dev" ]; then
--            warn "Device $_dev doesn't exist, skipping mount."
--            continue
--        fi
-         if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
-             fsck_single "$_dev" "$_fs"
-         fi
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
deleted file mode 100644
index 3b6c69ffccbf..000000000000
--- a/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0441230c51121c4a6e184b354a2f3a7cacb47b3b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 27 Mar 2012 16:00:02 +0200
-Subject: [PATCH 1/2] 95fstab-sys/mount-sys.sh: removed bashism
-
----
- modules.d/95fstab-sys/mount-sys.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
-index 0f660b7..8c9cb29 100755
---- a/modules.d/95fstab-sys/mount-sys.sh
-+++ b/modules.d/95fstab-sys/mount-sys.sh
-@@ -20,8 +20,8 @@ fstab_mount() {
-         fi
-         _fs=$(det_fs "$_dev" "$_fs")
-         info "Mounting $_dev"
--        if [[ -d $NEWROOT/$_mp ]]; then
--            mount -v -t $_fs -o $_opts $_dev $NEWROOT/$_mp 2>&1 | vinfo
-+        if [ -d "$NEWROOT/$_mp" ]; then
-+            mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo
-         else
-             mkdir -p "$_mp"
-             mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch b/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch
deleted file mode 100644
index eb8da2fc4d20..000000000000
--- a/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f575da6f7ca80c97d0299878b13c71c67f22460f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 26 Mar 2012 00:03:57 +0200
-Subject: [PATCH] inst_symlink: create parent dir if doesn't exist
-
-If symlink is yet alone in target directory, inst_symlink will fail to
-create it.  This is how to reproduce the bug:
-
- # mkdir /tmp/test
- # ln -s /bin/cp /tmp/test/cp
- # ./dracut -l -f -H /tmp/test.img -I /tmp/test/cp
-
-Result:
-
-[...]
-
-I: *** Including modules done ***
-ln: failed to create symbolic link
-`/var/tmp/initramfs.Z5isVu//tmp/test/cp': No such file or directory
-ln: failed to create symbolic link
-`/var/tmp/initramfs.Z5isVu//tmp/test/cp': No such file or directory
-I: Wrote /tmp/test.img:
-
-[...]
-
-Following patch creates directory for the symlink if it doesn't exist.
----
- dracut-functions.sh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index f4ccf53..8082466 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -545,6 +545,7 @@ inst_symlink() {
-             inst "$_realsrc"
-         fi
-     fi
-+    [[ ! -e $initdir/${_target%/*} ]] && inst_dir "${_target%/*}"
-     [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/}
-     ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
- }
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch
deleted file mode 100644
index 2b9cffad38c4..000000000000
--- a/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Feb 2011 01:44:25 +0100
-Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index f78517c..3f4f612 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -58,6 +58,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.4.1
-
diff --git a/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch b/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch
deleted file mode 100644
index 83d004d62b49..000000000000
--- a/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From decb1e033b26a1de80b452338ac7cff37a2471f5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 26 Mar 2012 13:29:07 +0200
-Subject: [PATCH 1/2] add --tmpdir option to cmd line args and tmpdir to
- config file
-
-Default temporary directory used by Dracut is /var/tmp, but users might
-want to change it to /tmp.
----
- dracut.conf |    3 +++
- dracut.sh   |    9 +++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.conf b/dracut.conf
-index a502066..e5fdd85 100644
---- a/dracut.conf
-+++ b/dracut.conf
-@@ -38,3 +38,6 @@ lvmconf="yes"
- 
- # inhibit installation of any fsck tools
- #nofscks="yes"
-+
-+# temporary directory
-+#tmpdir=/var/tmp
-diff --git a/dracut.sh b/dracut.sh
-index 1bf8ad9..5887131 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -80,6 +80,8 @@ Creates initial ramdisk images for preloading modules
-                          Default: /etc/dracut.conf
-   --confdir [DIR]       Specify configuration directory to use *.conf files
-                          from. Default: /etc/dracut.conf.d
-+  --tmpdir [DIR]        Temporary directory to be used instead of default
-+                         /var/tmp.
-   -l, --local           Local mode. Use modules from the current working
-                          directory instead of the system-wide installed in
-                          /usr/lib/dracut/modules.d.
-@@ -225,6 +227,7 @@ while (($# > 0)); do
-         -k|--kmoddir)  read_arg drivers_dir_l        "$@" || shift;;
-         -c|--conf)     read_arg conffile             "$@" || shift;;
-         --confdir)     read_arg confdir              "$@" || shift;;
-+        --tmpdir)      read_arg tmpdir_l             "$@" || shift;;
-         -L|--stdlog)   read_arg stdloglvl_l          "$@" || shift;;
-         --compress)    read_arg compress_l           "$@" || shift;;
-         --prefix)      read_arg prefix_l             "$@" || shift;;
-@@ -411,6 +414,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
-+[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
-+[[ $tmpdir ]] || tmpdir=/var/tmp
- [[ $do_strip ]] || do_strip=no
- [[ $compress_l ]] && compress=$compress_l
- [[ $show_modules_l ]] && show_modules=$show_modules_l
-@@ -544,8 +549,8 @@ elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
-     exit 1
- fi
- 
--readonly TMPDIR=/var/tmp
--readonly initdir=$(mktemp --tmpdir=/var/tmp/ -d -t initramfs.XXXXXX)
-+readonly TMPDIR="$tmpdir"
-+readonly initdir=$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)
- [ -d "$initdir" ] || {
-     dfatal "mktemp failed."
-     exit 1
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch b/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch
deleted file mode 100644
index 4d7f22b75228..000000000000
--- a/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cc74a06f4cf602f198092284d196fc4507bd806c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 Feb 2012 12:54:01 +0100
-Subject: [PATCH 1/4] 98usrmount/mount-usr.sh: ignore comments in fstab
-
----
- modules.d/98usrmount/mount-usr.sh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 3e23b15..f9d049e 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -39,6 +39,7 @@ mount_usr()
-     local _dev _mp _fs _opts _rest _usr_found _ret _freq _passno
-     # check, if we have to mount the /usr filesystem
-     while read _dev _mp _fs _opts _freq _passno; do
-+        [ "${_dev%%#*}" != "$_dev" ] && continue
-         if [ "$_mp" = "/usr" ]; then
-             case "$_dev" in
-                 LABEL=*)
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch b/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch
deleted file mode 100644
index cf5a2c678c4d..000000000000
--- a/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fdcfa200db3d2482ef1f63a4c6d024a556d17337 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 Feb 2012 16:35:08 +0100
-Subject: [PATCH 2/4] 98usrmount/mount-usr.sh: check, if we have
- $NEWROOT/etc/fstab
-
----
- modules.d/98usrmount/mount-usr.sh |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index f9d049e..39f75b9 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -73,4 +73,6 @@ mount_usr()
-     fi
- }
- 
--mount_usr
-+if [ -f "$NEWROOT/etc/fstab" ]; then
-+    mount_usr
-+fi
--- 
-1.7.8.4
-