wok rev 21822
Remove unused kernel cmdline args root=/dev/null
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Aug 25 18:00:45 2019 +0200 (2019-08-25) |
| parents | 54edd52e6caa |
| children | fa0390929820 |
| files | grub/stuff/example-menu.lst grub2/stuff/example-grub.cfg grub4dos/stuff/menu.lst linld/stuff/linld.txt linld/stuff/load.u linld/stuff/src/LINLD.CPP linld/stuff/src/TAZBOOT.CPP linux-uml/receipt syslinux/stuff/iso2exe/boot.c syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/taziso syslinux/stuff/isolinux.cfg tazlito/receipt |
line diff
1.1 --- a/grub/stuff/example-menu.lst Sun Aug 25 12:03:28 2019 +0200 1.2 +++ b/grub/stuff/example-menu.lst Sun Aug 25 18:00:45 2019 +0200 1.3 @@ -13,7 +13,7 @@ 1.4 # For booting SliTaz from a cdrom (LiveCD). 1.5 # 1.6 #title SliTaz GNU/Linux (Cooking) (Kernel 2.6.22.9) 1.7 -#kernel /boot/bzImage root=/dev/null vga=771 1.8 +#kernel /boot/bzImage vga=771 1.9 #initrd /boot/rootfs.gz 1.10 1.11 # For booting SliTaz from hda1.
2.1 --- a/grub2/stuff/example-grub.cfg Sun Aug 25 12:03:28 2019 +0200 2.2 +++ b/grub2/stuff/example-grub.cfg Sun Aug 25 18:00:45 2019 +0200 2.3 @@ -14,7 +14,7 @@ 2.4 # For booting SliTaz from a cdrom (LiveCD). 2.5 # 2.6 #menuentry "SliTaz GNU/Linux (Cooking)" { 2.7 -# linux /boot/bzImage root=/dev/null vga=771 2.8 +# linux /boot/bzImage vga=771 2.9 # initrd /boot/rootfs.gz 2.10 #} 2.11
3.1 --- a/grub4dos/stuff/menu.lst Sun Aug 25 12:03:28 2019 +0200 3.2 +++ b/grub4dos/stuff/menu.lst Sun Aug 25 18:00:45 2019 +0200 3.3 @@ -23,7 +23,7 @@ 3.4 3.5 title Slitaz Frugal 3.6 find --set-root --ignore-floppies /boot/rootfs.gz 3.7 - kernel /boot/bzImage rw root=/dev/null vga=normal 3.8 + kernel /boot/bzImage vga=normal 3.9 initrd /boot/rootfs.gz 3.10 3.11 title Windows NT/2K/XP
4.1 --- a/linld/stuff/linld.txt Sun Aug 25 12:03:28 2019 +0200 4.2 +++ b/linld/stuff/linld.txt Sun Aug 25 18:00:45 2019 +0200 4.3 @@ -53,4 +53,4 @@ 4.4 > linld @args.cmd 4.5 4.6 The -f and -b are useful skip XMM (max 64M ?) and VCPI (max 32M ?) limits: 4.7 -> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=rw root=/dev/null video=-32" 4.8 +> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=video=-32"
5.1 --- a/linld/stuff/load.u Sun Aug 25 12:03:28 2019 +0200 5.2 +++ b/linld/stuff/load.u Sun Aug 25 18:00:45 2019 +0200 5.3 @@ -52,7 +52,7 @@ 5.4 +#if 0 5.5 + NL NL "Example" NL 5.6 + "\tcopy/b rootfs4.gz+rootfs3.gz+rootfs2.gz+rootfs1.gz rootfs.gz" NL 5.7 -+ "\tlinld initrd=rootfs.gz \"cl=rw root=/dev/null video=-32\"" 5.8 ++ "\tlinld initrd=rootfs.gz \"cl=video=-32\"" 5.9 +#endif 5.10 ); 5.11 }
6.1 --- a/linld/stuff/src/LINLD.CPP Sun Aug 25 12:03:28 2019 +0200 6.2 +++ b/linld/stuff/src/LINLD.CPP Sun Aug 25 18:00:45 2019 +0200 6.3 @@ -33,7 +33,7 @@ 6.4 NL NL "Examples:" NL 6.5 "\tLINLD -f -b 64m " 6.6 "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz " 6.7 - "\"cl=rw root=/dev/null video=-32\"" 6.8 + "\"cl=video=-32\"" 6.9 NL NL "\tLINLD image=memtest" 6.10 #endif 6.11 );
7.1 --- a/linld/stuff/src/TAZBOOT.CPP Sun Aug 25 12:03:28 2019 +0200 7.2 +++ b/linld/stuff/src/TAZBOOT.CPP Sun Aug 25 18:00:45 2019 +0200 7.3 @@ -154,7 +154,7 @@ 7.4 bootfrom=\\isos\\slitaz-4.0.iso\n\ 7.5 kernel=boot/bzImage\n\ 7.6 initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ 7.7 - rw root=/dev/null vga=normal autologin\n\n\ 7.8 + vga=normal autologin\n\n\ 7.9 kernel=\\slitaz\\elks\n\ 7.10 root=/dev/bda1 ro\n"); 7.11 }
8.1 --- a/linux-uml/receipt Sun Aug 25 12:03:28 2019 +0200 8.2 +++ b/linux-uml/receipt Sun Aug 25 18:00:45 2019 +0200 8.3 @@ -97,7 +97,7 @@ 8.4 # /etc/inittab: "tty21::respawn:/bin/su -c '/boot/vm-uml 1 /boot/guests/slitaz.img 2 512m' nobody" 8.5 n=\${1:-0} 8.6 tap=tap\$n 8.7 -args="rw root=/dev/null" 8.8 +args="" 8.9 dev="initrd=\$(ls -r /boot/rootfs*.gz | sed q)" 8.10 if [ -n "\$2" ]; then 8.11 args="ro root=620\${3:-1} screen=text sound=noconf"
9.1 --- a/syslinux/stuff/iso2exe/boot.c Sun Aug 25 12:03:28 2019 +0200 9.2 +++ b/syslinux/stuff/iso2exe/boot.c Sun Aug 25 18:00:45 2019 +0200 9.3 @@ -16,7 +16,7 @@ 9.4 bootfrom=\\isos\\slitaz-4.0.iso\n\ 9.5 kernel=boot/bzImage\n\ 9.6 initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ 9.7 - rw root=/dev/null vga=normal autologin\n\n\ 9.8 + vga=normal autologin\n\n\ 9.9 kernel=\\slitaz\\elks\n\ 9.10 root=/dev/bda1 ro\n",iso,iso,iso); 9.11 exit(1); 9.12 @@ -61,7 +61,7 @@ 9.13 if (magic > 0) { 9.14 char *initrd = fallback; 9.15 9.16 - fmt = "rw root=/dev/null bootfrom=%s%s magic=%lu mode=%s autologin"; 9.17 + fmt = "bootfrom=%s%s magic=%lu mode=%s autologin"; 9.18 if (rootfs[0]) { 9.19 initrd = rootfs; 9.20 if (rootfs[6] != '.' && !isoopen("rootfs.gz"))
10.1 --- a/syslinux/stuff/iso2exe/init Sun Aug 25 12:03:28 2019 +0200 10.2 +++ b/syslinux/stuff/iso2exe/init Sun Aug 25 18:00:45 2019 +0200 10.3 @@ -342,7 +342,7 @@ 10.4 unix2dos > /mnt/slitaz/boot/tazboot.cmd <<EOT 10.5 kernel=/slitaz/boot/bzimage 10.6 initrd=/slitaz/boot/$initrd 10.7 -rw root=/dev/null $extraargs autologin 10.8 +$extraargs autologin 10.9 EOT 10.10 uudecode - <<EOT | gunzip > /mnt/slitaz/boot/slitaz.pif 10.11 begin-base64 644 - 10.12 @@ -446,7 +446,7 @@ 10.13 bootfrom=\\isos\\slitaz-4.0.iso\n\ 10.14 kernel=boot/bzImage\n\ 10.15 initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ 10.16 - rw root=/dev/null autologin\n\n\ 10.17 + autologin\n\n\ 10.18 kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n 10.19 Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 24 78 10.20 [ $? -eq 0 ] || return
11.1 --- a/syslinux/stuff/iso2exe/taziso Sun Aug 25 12:03:28 2019 +0200 11.2 +++ b/syslinux/stuff/iso2exe/taziso Sun Aug 25 18:00:45 2019 +0200 11.3 @@ -253,7 +253,7 @@ 11.4 unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT 11.5 kernel=/slitaz/boot/bzimage 11.6 initrd=/slitaz/boot/$initrd 11.7 -rw root=/dev/null $extraargs autologin 11.8 +$extraargs autologin 11.9 EOT 11.10 uudecode - <<EOT | gunzip > $mnt/slitaz/boot/slitaz.pif 11.11 begin-base64 644 - 11.12 @@ -303,7 +303,7 @@ 11.13 echo -en "\nUpdate /boot/grub/menu.lst..." 11.14 cat >> $mnt/boot/grub/menu.lst <<EOT 11.15 title SliTaz GNU/Linux $(cat $mnt/slitaz/etc/slitaz-release) 11.16 - kernel /slitaz/boot/$bzimage rw root=/dev/null $extraargs autologin 11.17 + kernel /slitaz/boot/$bzimage $extraargs autologin 11.18 initrd /slitaz/boot/$initrd 11.19 11.20 EOT 11.21 @@ -552,7 +552,7 @@ 11.22 n=$((4 - ($(stat -c %s $i) % 4))) 11.23 [ $n -eq 4 ] || dd if=/dev/zero bs=1 count=$n 11.24 done > initrd$$ 11.25 - cmdline="root=/dev/null autologin lang=$LANG" 11.26 + cmdline="autologin lang=$LANG" 11.27 [ -s /etc/keymap.conf ] && cmdline="$cmdline kmap=$(cat /etc/keymap.conf)" 11.28 [ -s /etc/TZ ] && cmdline="$cmdline tz=$(cat /etc/TZ)" 11.29 rm -f cmdline initrd 2> /dev/null 11.30 @@ -582,7 +582,7 @@ 11.31 bootfrom=\\isos\\slitaz-4.0.iso\n\ 11.32 kernel=boot/bzImage\n\ 11.33 initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ 11.34 - rw root=/dev/null autologin\n\n\ 11.35 + autologin\n\n\ 11.36 kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n 11.37 Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 0 0 11.38 [ $? -eq 0 ] || return
12.1 --- a/syslinux/stuff/isolinux.cfg Sun Aug 25 12:03:28 2019 +0200 12.2 +++ b/syslinux/stuff/isolinux.cfg Sun Aug 25 18:00:45 2019 +0200 12.3 @@ -25,7 +25,7 @@ 12.4 LABEL slitaz 12.5 MENU LABEL SliTaz Live 12.6 COM32 c32box.c32 12.7 - APPEND linux /boot/bzImage initrd=/boot/rootfs.gz rw root=/dev/null video=-32 autologin 12.8 + APPEND linux /boot/bzImage initrd=/boot/rootfs.gz video=-32 autologin 12.9 12.10 LABEL help 12.11 MENU LABEL Help & Options
13.1 --- a/tazlito/receipt Sun Aug 25 12:03:28 2019 +0200 13.2 +++ b/tazlito/receipt Sun Aug 25 18:00:45 2019 +0200 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="tazlito" 13.7 -VERSION="516" 13.8 +VERSION="519" 13.9 CATEGORY="base-system" 13.10 SHORT_DESC="SliTaz Live Tool." 13.11 MAINTAINER="pascal.bellard@slitaz.org"