From: Harald Hoyer <harald@redhat.com>
Date: Fri, 30 Nov 2012 10:15:39 +0000 (+0100)
Subject: change for "udevadm control": s/--reload-rules/--reload/g
X-Git-Tag: 025~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43cc4d84bc3e3a3d38cf54762969f48fde52fd00;p=thirdparty%2Fdracut.git

change for "udevadm control": s/--reload-rules/--reload/g
---

diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh
index ce900ad26..6bede87fe 100755
--- a/test/TEST-01-BASIC/create-root.sh
+++ b/test/TEST-01-BASIC/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-02-SYSTEMD/create-root.sh
index fe2ce12fb..0363c939d 100755
--- a/test/TEST-02-SYSTEMD/create-root.sh
+++ b/test/TEST-02-SYSTEMD/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index a9640eba7..04f5bfec7 100755
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 5120 -H 2 -S 32 -L /dev/sda <<EOF
diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 2e33920fd..4f731833b 100755
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 10240 -H 2 -S 32 -L /dev/sda <<EOF
diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index cd67819af..8e5e54267 100755
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,16
diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index 4d58e4dc1..5907941d0 100755
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,1
diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
index d5a8c0be6..07d0b3938 100755
--- a/test/TEST-12-RAID-DEG/create-root.sh
+++ b/test/TEST-12-RAID-DEG/create-root.sh
@@ -7,7 +7,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
 ,16
diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index 6612a122d..c8b67818d 100755
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
@@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
 ,16
diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
index 3debf33c2..cd51935ab 100755
--- a/test/TEST-15-BTRFSRAID/create-root.sh
+++ b/test/TEST-15-BTRFSRAID/create-root.sh
@@ -3,7 +3,7 @@
 for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
-udevadm control --reload-rules
+udevadm control --reload
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 655600 -H 2 -S 32 -L /dev/sda <<EOF
 ,16
diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh
index 8116a1384..d91e5b87a 100755
--- a/test/TEST-30-ISCSI/create-root.sh
+++ b/test/TEST-30-ISCSI/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 mkfs.ext3 -j -F /dev/sda && \
 mkdir -p /sysroot && \
 mount /dev/sda /sysroot && \
diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh
index 5b902c3ea..9c1c09e3d 100755
--- a/test/TEST-40-NBD/create-root.sh
+++ b/test/TEST-40-NBD/create-root.sh
@@ -4,7 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
 rm /etc/lvm/lvm.conf
-udevadm control --reload-rules
+udevadm control --reload
 echo -n test >keyfile
 cryptsetup -q luksFormat /dev/sdb /keyfile
 echo "The passphrase is test"
diff --git a/test/old.TEST-14-IMSM/create-root.sh b/test/old.TEST-14-IMSM/create-root.sh
index df0f4146a..4709028bc 100755
--- a/test/old.TEST-14-IMSM/create-root.sh
+++ b/test/old.TEST-14-IMSM/create-root.sh
@@ -5,7 +5,7 @@ for x in 61-dmraid-imsm.rules 64-md-raid.rules 65-md-incremental-imsm.rules 65-m
 done
 rm /etc/lvm/lvm.conf
 
-udevadm control --reload-rules
+udevadm control --reload
 # dmraid does not want symlinks in --disk "..."
 if [ -e /dev/hda ] ; then
     echo y|dmraid -f isw -C Test0 --type 1 --disk "/dev/hdb /dev/hdc"