diff options
author | Harald Hoyer <harald@redhat.com> | 2010-10-28 12:47:45 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2010-10-28 17:11:27 +0200 |
commit | fa7ada31d0228f8aeedb03bae72469e2838839fe (patch) | |
tree | b7060720c7035a9b84af7a3cf5f3ec85eb6ed868 /test | |
parent | 54b01e99d3c9436b74abac66990c081d260b1124 (diff) | |
download | dracut-fa7ada31d0228f8aeedb03bae72469e2838839fe.tar.gz dracut-fa7ada31d0228f8aeedb03bae72469e2838839fe.tar.bz2 dracut-fa7ada31d0228f8aeedb03bae72469e2838839fe.zip |
new parameter option names with "rd.*" namespace
Renamed Options
Here is a list of options, which were used in dracut prior to
version 008, and their new replacement.
rdbreak
rd.break
rd_CCW
rd.ccw
rdcopystate
rd.copystate
rd_DASD_MOD
rd.dasd_mod.dasd
rd_DASD
rd.dasd
rdinitdebug rdnetdebug
rd.debug
rd_NO_DM
rd.dm=0
rd_DM_UUID
rd.dm.uuid
rdblacklist
rd.driver.blacklist
rdinsmodpost
rd.driver.post
rdloaddriver
rd.driver.pre
rd_NO_FSTAB
rd.fstab=0
rdinfo
rd.info
check
rd.live.check
rdlivedebug
rd.live.debug
live_dir
rd.live.dir
liveimg
rd.live.image
overlay
rd.live.overlay
readonly_overlay
rd.live.overlay.readonly
reset_overlay
rd.live.overlay.reset
live_ram
rd.live.ram
rd_NO_CRYPTTAB
rd.luks.crypttab=0
rd_LUKS_KEYDEV_UUID
rd.luks.keydev.uuid
rd_LUKS_KEYPATH
rd.luks.keypath
rd_NO_LUKS
rd.luks=0
rd_LUKS_UUID
rd.luks.uuid
rd_LUKS_UUID
rd.luks.uuid
rd_NO_LVMCONF
rd.lvm.conf
rd_LVM_LV
rd.lvm.lv
rd_NO_LVM
rd.lvm=0
rd_LVM_SNAPSHOT
rd.lvm.snapshot
rd_LVM_SNAPSIZE
rd.lvm.snapsize
rd_LVM_VG
rd.lvm.vg
rd_NO_MDADMCONF
rd.md.conf=0
rd_NO_MDIMSM
rd.md.imsm=0
rd_NO_MD
rd.md=0
rd_MD_UUID
rd.md.uuid
rd_NFS_DOMAIN
rd.nfs.domain
rd_NO_PLYMOUTH
rd.plymouth=0
rd_retry
rd.retry
rdshell
rd.shell
rd_NO_SPLASH
rd.splash
rdudevdebug
rd.udev.debug
rdudevinfo
rd.udev.info
rd_NO_ZFCPCONF
rd.zfcp.conf=0
rd_ZFCP
rd.zfcp
Diffstat (limited to 'test')
-rwxr-xr-x | test/TEST-10-RAID/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-10-RAID/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-11-LVM/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-11-LVM/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-12-RAID-DEG/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 22 | ||||
-rwxr-xr-x | test/TEST-13-ENC-RAID-LVM/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-13-ENC-RAID-LVM/test.sh | 10 | ||||
-rwxr-xr-x | test/TEST-14-IMSM/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-14-IMSM/test.sh | 14 | ||||
-rwxr-xr-x | test/TEST-20-NFS/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-20-NFS/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-30-ISCSI/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-30-ISCSI/test.sh | 6 | ||||
-rwxr-xr-x | test/TEST-40-NBD/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-40-NBD/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-50-MULTINIC/hard-off.sh | 2 | ||||
-rwxr-xr-x | test/TEST-50-MULTINIC/test.sh | 6 |
18 files changed, 46 insertions, 46 deletions
diff --git a/test/TEST-10-RAID/hard-off.sh b/test/TEST-10-RAID/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-10-RAID/hard-off.sh +++ b/test/TEST-10-RAID/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 159de993..88c42c14 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -4,12 +4,12 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-11-LVM/hard-off.sh b/test/TEST-11-LVM/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-11-LVM/hard-off.sh +++ b/test/TEST-11-LVM/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 508ac5f4..91b73e90 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -4,12 +4,12 @@ TEST_DESCRIPTION="root filesystem on LVM PV" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-12-RAID-DEG/hard-off.sh b/test/TEST-12-RAID-DEG/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-12-RAID-DEG/hard-off.sh +++ b/test/TEST-12-RAID-DEG/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index fd1d4c05..8c657a1d 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -4,13 +4,13 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a degraded RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -DEBUGFAIL="rdshell" +DEBUGFAIL="rd.shell" client_run() { echo "CLIENT TEST START: $@" $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$@ root=LABEL=root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL " \ + -append "$@ root=LABEL=root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ -initrd initramfs.testing if ! grep -m 1 -q dracut-root-block-success root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" @@ -28,23 +28,23 @@ test_run() { client_run || return 1 -# client_run rd_NO_MDADMCONF || return 1 +# client_run rd.md.conf=0 || return 1 - client_run rd_NO_LVM failme && return 1 + client_run rd.lvm=0 failme && return 1 - client_run rd_LVM_VG=failme failme && return 1 + client_run rd.lvm.vg=failme failme && return 1 - client_run rd_LVM_VG=dracut || return 1 + client_run rd.lvm.vg=dracut || return 1 -# client_run rd_MD_UUID=$MD_UUID rd_NO_MDADMCONF || return 1 +# client_run rd.md.uuid=$MD_UUID rd.md.conf=0 || return 1 - client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 rd_NO_LVMCONF failme && return 1 + client_run rd.lvm.vg=dummy1 rd.lvm.vg=dracut rd.lvm.vg=dummy2 rd.lvm.conf=0 failme && return 1 -# client_run rd_MD_UUID=failme rd_NO_MDADMCONF failme && return 1 +# client_run rd.md.uuid=failme rd.md.conf=0 failme && return 1 - client_run rd_NO_MD failme && return 1 + client_run rd.md=0 failme && return 1 -# client_run rd_MD_UUID=dummy1 rd_MD_UUID=$MD_UUID rd_MD_UUID=dummy2 rd_NO_MDADMCONF failme && return 1 +# client_run rd.md.uuid=dummy1 rd.md.uuid=$MD_UUID rd.md.uuid=dummy2 rd.md.conf=0 failme && return 1 return 0 } diff --git a/test/TEST-13-ENC-RAID-LVM/hard-off.sh b/test/TEST-13-ENC-RAID-LVM/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-13-ENC-RAID-LVM/hard-off.sh +++ b/test/TEST-13-ENC-RAID-LVM/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index f149f289..57964183 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on LVM on encrypted partitions of a RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" # udev.log-priority=debug +#DEBUGFAIL="rd.shell" # udev.log-priority=debug test_run() { LUKSARGS=$(cat luks.txt) @@ -14,7 +14,7 @@ test_run() { echo "CLIENT TEST START: $LUKSARGS" $testdir/run-qemu -hda root.ext2 -hdb check-success.img -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $LUKSARGS $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $LUKSARGS $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success check-success.img || return 1 echo "CLIENT TEST END: [OK]" @@ -24,7 +24,7 @@ test_run() { echo "CLIENT TEST START: Any LUKS" $testdir/run-qemu -hda root.ext2 -hdb check-success.img -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success check-success.img || return 1 echo "CLIENT TEST END: [OK]" @@ -34,7 +34,7 @@ test_run() { echo "CLIENT TEST START: Wrong LUKS UUID" $testdir/run-qemu -hda root.ext2 -hdb check-success.img -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL rd_LUKS_UUID=failme" \ + -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success check-success.img && return 1 echo "CLIENT TEST END: [OK]" @@ -89,7 +89,7 @@ test_setup() { cryptoUUIDS=$(grep --binary-files=text -m 3 ID_FS_UUID root.ext2) for uuid in $cryptoUUIDS; do eval $uuid - printf ' rd_LUKS_UUID=luks-%s ' $ID_FS_UUID + printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID done > luks.txt diff --git a/test/TEST-14-IMSM/hard-off.sh b/test/TEST-14-IMSM/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-14-IMSM/hard-off.sh +++ b/test/TEST-14-IMSM/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 360b08c9..047cf71d 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -4,14 +4,14 @@ TEST_DESCRIPTION="root filesystem on LVM PV on a isw dmraid" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -DEBUGFAIL="rdshell" +DEBUGFAIL="rd.shell" #DEBUGFAIL="$DEBUGFAIL udev.log-priority=debug" client_run() { echo "CLIENT TEST START: $@" $testdir/run-qemu -hda root.ext2 -hdb disk1 -hdc disk2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$@ root=LABEL=root rw quiet rd_retry=5 rdinitdebug console=ttyS0,115200n81 selinux=0 rdinfo $DEBUGFAIL" \ + -append "$@ root=LABEL=root rw quiet rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \ -initrd initramfs.testing if ! grep -m 1 -q dracut-root-block-success root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" @@ -24,15 +24,15 @@ client_run() { } test_run() { - client_run rd_NO_MDIMSM || return 1 + client_run rd.md.imsm || return 1 client_run || return 1 - client_run rd_NO_DM || return 1 + client_run rd.dm=0 || return 1 # This test succeeds, because the mirror parts are found without # assembling the mirror itsself, which is what we want - client_run rd_NO_MD rd_NO_MDIMSM failme && return 1 - client_run rd_NO_MD failme && return 1 + client_run rd.md=0 rd.md.imsm failme && return 1 + client_run rd.md=0 failme && return 1 # the following test hangs on newer md - #client_run rd_NO_DM rd_NO_MDIMSM rd_NO_MDADMCONF || return 1 + #client_run rd.dm=0 rd.md.imsm rd.md.conf=0 || return 1 return 0 } diff --git a/test/TEST-20-NFS/hard-off.sh b/test/TEST-20-NFS/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-20-NFS/hard-off.sh +++ b/test/TEST-20-NFS/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 24b909c6..455fda68 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NFS" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" run_server() { # Start server first @@ -46,7 +46,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,connect=127.0.0.1:12345 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdinitdebug rd_retry=10 rdinfo quiet rdnetdebug ro console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nfs-OK client.img; then diff --git a/test/TEST-30-ISCSI/hard-off.sh b/test/TEST-30-ISCSI/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-30-ISCSI/hard-off.sh +++ b/test/TEST-30-ISCSI/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index a0b85c31..12590150 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -3,7 +3,7 @@ TEST_DESCRIPTION="root filesystem over iSCSI" KVERSION=${KVERSION-$(uname -r)} -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" run_server() { # Start server first @@ -38,7 +38,7 @@ run_client() { -net nic,macaddr=52:54:00:12:34:00,model=e1000 \ -net socket,connect=127.0.0.1:12345 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "root=LABEL=sysroot ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:eth0:off netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2 rw quiet rd_retry=5 rdinitdebug rdinfo rdnetdebug console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \ + -append "root=LABEL=sysroot ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:eth0:off netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2 rw quiet rd.retry=5 rd.debug rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q iscsi-OK client.img || return 1 @@ -47,7 +47,7 @@ run_client() { -net nic,macaddr=52:54:00:12:34:00,model=e1000 \ -net socket,connect=127.0.0.1:12345 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "root=dhcp rw quiet rd_retry=5 rdinitdebug rdinfo rdnetdebug console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \ + -append "root=dhcp rw quiet rd.retry=5 rd.debug rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q iscsi-OK client.img || return 1 diff --git a/test/TEST-40-NBD/hard-off.sh b/test/TEST-40-NBD/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-40-NBD/hard-off.sh +++ b/test/TEST-40-NBD/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index ba68b48f..9425427b 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NBD" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" run_server() { # Start server first @@ -50,7 +50,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,connect=127.0.0.1:12345 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rd.debug rd.info ro quiet console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK flag.img; then diff --git a/test/TEST-50-MULTINIC/hard-off.sh b/test/TEST-50-MULTINIC/hard-off.sh index c9638321..12c3d5ac 100755 --- a/test/TEST-50-MULTINIC/hard-off.sh +++ b/test/TEST-50-MULTINIC/hard-off.sh @@ -1,3 +1,3 @@ #!/bin/sh -getarg rdshell || poweroff -f +getarg rd.shell || poweroff -f getarg failme && poweroff -f diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index e07ef3b6..dd9e3b1e 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NFS with multiple nics" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +#DEBUGFAIL="rd.shell" run_server() { # Start server first @@ -15,7 +15,7 @@ run_server() { -net socket,listen=127.0.0.1:12345 \ -serial udp:127.0.0.1:9999 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "selinux=0 root=/dev/sda rdinitdebug rdinfo rdnetdebug rw quiet console=ttyS0,115200n81" \ + -append "selinux=0 root=/dev/sda rd.debug rd.info rw quiet console=ttyS0,115200n81" \ -initrd initramfs.server -pidfile server.pid -daemonize || return 1 sudo chmod 644 server.pid || return 1 @@ -51,7 +51,7 @@ client_test() { -drive if=ide,index=2,media=disk \ -drive if=ide,index=3,media=disk \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rd_retry=5 rdinitdebug rdinfo rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0 rdcopystate" \ + -append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro quiet console=ttyS0,115200n81 selinux=0 rd.copystate" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q OK client.img; then |