# HG changeset patch # User Pascal Bellard # Date 1566748845 -7200 # Node ID e93e6b4d565ffb6277b58252e680a0b570d8a599 # Parent 54edd52e6caaf8d776d92a4d87089e386f158012 Remove unused kernel cmdline args root=/dev/null diff -r 54edd52e6caa -r e93e6b4d565f grub/stuff/example-menu.lst --- a/grub/stuff/example-menu.lst Sun Aug 25 12:03:28 2019 +0200 +++ b/grub/stuff/example-menu.lst Sun Aug 25 18:00:45 2019 +0200 @@ -13,7 +13,7 @@ # For booting SliTaz from a cdrom (LiveCD). # #title SliTaz GNU/Linux (Cooking) (Kernel 2.6.22.9) -#kernel /boot/bzImage root=/dev/null vga=771 +#kernel /boot/bzImage vga=771 #initrd /boot/rootfs.gz # For booting SliTaz from hda1. diff -r 54edd52e6caa -r e93e6b4d565f grub2/stuff/example-grub.cfg --- a/grub2/stuff/example-grub.cfg Sun Aug 25 12:03:28 2019 +0200 +++ b/grub2/stuff/example-grub.cfg Sun Aug 25 18:00:45 2019 +0200 @@ -14,7 +14,7 @@ # For booting SliTaz from a cdrom (LiveCD). # #menuentry "SliTaz GNU/Linux (Cooking)" { -# linux /boot/bzImage root=/dev/null vga=771 +# linux /boot/bzImage vga=771 # initrd /boot/rootfs.gz #} diff -r 54edd52e6caa -r e93e6b4d565f grub4dos/stuff/menu.lst --- a/grub4dos/stuff/menu.lst Sun Aug 25 12:03:28 2019 +0200 +++ b/grub4dos/stuff/menu.lst Sun Aug 25 18:00:45 2019 +0200 @@ -23,7 +23,7 @@ title Slitaz Frugal find --set-root --ignore-floppies /boot/rootfs.gz - kernel /boot/bzImage rw root=/dev/null vga=normal + kernel /boot/bzImage vga=normal initrd /boot/rootfs.gz title Windows NT/2K/XP diff -r 54edd52e6caa -r e93e6b4d565f linld/stuff/linld.txt --- a/linld/stuff/linld.txt Sun Aug 25 12:03:28 2019 +0200 +++ b/linld/stuff/linld.txt Sun Aug 25 18:00:45 2019 +0200 @@ -53,4 +53,4 @@ > linld @args.cmd The -f and -b are useful skip XMM (max 64M ?) and VCPI (max 32M ?) limits: -> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=rw root=/dev/null video=-32" +> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=video=-32" diff -r 54edd52e6caa -r e93e6b4d565f linld/stuff/load.u --- a/linld/stuff/load.u Sun Aug 25 12:03:28 2019 +0200 +++ b/linld/stuff/load.u Sun Aug 25 18:00:45 2019 +0200 @@ -52,7 +52,7 @@ +#if 0 + NL NL "Example" NL + "\tcopy/b rootfs4.gz+rootfs3.gz+rootfs2.gz+rootfs1.gz rootfs.gz" NL -+ "\tlinld initrd=rootfs.gz \"cl=rw root=/dev/null video=-32\"" ++ "\tlinld initrd=rootfs.gz \"cl=video=-32\"" +#endif ); } diff -r 54edd52e6caa -r e93e6b4d565f linld/stuff/src/LINLD.CPP --- a/linld/stuff/src/LINLD.CPP Sun Aug 25 12:03:28 2019 +0200 +++ b/linld/stuff/src/LINLD.CPP Sun Aug 25 18:00:45 2019 +0200 @@ -33,7 +33,7 @@ NL NL "Examples:" NL "\tLINLD -f -b 64m " "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz " - "\"cl=rw root=/dev/null video=-32\"" + "\"cl=video=-32\"" NL NL "\tLINLD image=memtest" #endif ); diff -r 54edd52e6caa -r e93e6b4d565f linld/stuff/src/TAZBOOT.CPP --- a/linld/stuff/src/TAZBOOT.CPP Sun Aug 25 12:03:28 2019 +0200 +++ b/linld/stuff/src/TAZBOOT.CPP Sun Aug 25 18:00:45 2019 +0200 @@ -154,7 +154,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ - rw root=/dev/null vga=normal autologin\n\n\ + vga=normal autologin\n\n\ kernel=\\slitaz\\elks\n\ root=/dev/bda1 ro\n"); } diff -r 54edd52e6caa -r e93e6b4d565f linux-uml/receipt --- a/linux-uml/receipt Sun Aug 25 12:03:28 2019 +0200 +++ b/linux-uml/receipt Sun Aug 25 18:00:45 2019 +0200 @@ -97,7 +97,7 @@ # /etc/inittab: "tty21::respawn:/bin/su -c '/boot/vm-uml 1 /boot/guests/slitaz.img 2 512m' nobody" n=\${1:-0} tap=tap\$n -args="rw root=/dev/null" +args="" dev="initrd=\$(ls -r /boot/rootfs*.gz | sed q)" if [ -n "\$2" ]; then args="ro root=620\${3:-1} screen=text sound=noconf" diff -r 54edd52e6caa -r e93e6b4d565f syslinux/stuff/iso2exe/boot.c --- a/syslinux/stuff/iso2exe/boot.c Sun Aug 25 12:03:28 2019 +0200 +++ b/syslinux/stuff/iso2exe/boot.c Sun Aug 25 18:00:45 2019 +0200 @@ -16,7 +16,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ - rw root=/dev/null vga=normal autologin\n\n\ + vga=normal autologin\n\n\ kernel=\\slitaz\\elks\n\ root=/dev/bda1 ro\n",iso,iso,iso); exit(1); @@ -61,7 +61,7 @@ if (magic > 0) { char *initrd = fallback; - fmt = "rw root=/dev/null bootfrom=%s%s magic=%lu mode=%s autologin"; + fmt = "bootfrom=%s%s magic=%lu mode=%s autologin"; if (rootfs[0]) { initrd = rootfs; if (rootfs[6] != '.' && !isoopen("rootfs.gz")) diff -r 54edd52e6caa -r e93e6b4d565f syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Sun Aug 25 12:03:28 2019 +0200 +++ b/syslinux/stuff/iso2exe/init Sun Aug 25 18:00:45 2019 +0200 @@ -342,7 +342,7 @@ unix2dos > /mnt/slitaz/boot/tazboot.cmd < /mnt/slitaz/boot/slitaz.pif begin-base64 644 - @@ -446,7 +446,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ - rw root=/dev/null autologin\n\n\ + autologin\n\n\ kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 24 78 [ $? -eq 0 ] || return diff -r 54edd52e6caa -r e93e6b4d565f syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Sun Aug 25 12:03:28 2019 +0200 +++ b/syslinux/stuff/iso2exe/taziso Sun Aug 25 18:00:45 2019 +0200 @@ -253,7 +253,7 @@ unix2dos > $mnt/slitaz/boot/tazboot.cmd < $mnt/slitaz/boot/slitaz.pif begin-base64 644 - @@ -303,7 +303,7 @@ echo -en "\nUpdate /boot/grub/menu.lst..." cat >> $mnt/boot/grub/menu.lst < initrd$$ - cmdline="root=/dev/null autologin lang=$LANG" + cmdline="autologin lang=$LANG" [ -s /etc/keymap.conf ] && cmdline="$cmdline kmap=$(cat /etc/keymap.conf)" [ -s /etc/TZ ] && cmdline="$cmdline tz=$(cat /etc/TZ)" rm -f cmdline initrd 2> /dev/null @@ -582,7 +582,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ - rw root=/dev/null autologin\n\n\ + autologin\n\n\ kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 0 0 [ $? -eq 0 ] || return diff -r 54edd52e6caa -r e93e6b4d565f syslinux/stuff/isolinux.cfg --- a/syslinux/stuff/isolinux.cfg Sun Aug 25 12:03:28 2019 +0200 +++ b/syslinux/stuff/isolinux.cfg Sun Aug 25 18:00:45 2019 +0200 @@ -25,7 +25,7 @@ LABEL slitaz MENU LABEL SliTaz Live COM32 c32box.c32 - APPEND linux /boot/bzImage initrd=/boot/rootfs.gz rw root=/dev/null video=-32 autologin + APPEND linux /boot/bzImage initrd=/boot/rootfs.gz video=-32 autologin LABEL help MENU LABEL Help & Options diff -r 54edd52e6caa -r e93e6b4d565f tazlito/receipt --- a/tazlito/receipt Sun Aug 25 12:03:28 2019 +0200 +++ b/tazlito/receipt Sun Aug 25 18:00:45 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazlito" -VERSION="516" +VERSION="519" CATEGORY="base-system" SHORT_DESC="SliTaz Live Tool." MAINTAINER="pascal.bellard@slitaz.org"