Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change from -- to --- for kernel command line handling 

Closes: #764676
This commit is contained in:
Steve McIntyre 2014-11-06 12:55:59 +00:00
parent 09363728c3
commit 2900545769
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/jessie/pegasos/pegasos
View File

@ -37,10 +37,10 @@
: my-boot-case ( num -- ) : my-boot-case ( num -- )
." " cr ." " cr
case case
1 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof 1 of " cd install/powerpc/vmlinuz-chrp.initrd ---" endof
2 of " cd install/powerpc/vmlinuz-chrp.initrd priority=low --" endof 2 of " cd install/powerpc/vmlinuz-chrp.initrd priority=low ---" endof
3 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true --" endof 3 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true ---" endof
4 of " cd install/powerpc/vmlinuz-chrp.initrd auto=true priority=critical --" endof 4 of " cd install/powerpc/vmlinuz-chrp.initrd auto=true priority=critical ---" endof
5 of " none" endof 5 of " none" endof
endcase endcase
$boot $boot

8
data/jessie/yaboot/mac32.conf
View File

@ -9,27 +9,27 @@ message=/install/boot32.msg
image=/install/powerpc/vmlinux image=/install/powerpc/vmlinux
label=install label=install
initrd=/install/powerpc/initrd.gz initrd=/install/powerpc/initrd.gz
append="--" append="---"
initrd-size=10240 initrd-size=10240
read-only read-only
image=/install/powerpc/vmlinux image=/install/powerpc/vmlinux
label=expert label=expert
initrd=/install/powerpc/initrd.gz initrd=/install/powerpc/initrd.gz
append="priority=low --" append="priority=low ---"
initrd-size=10240 initrd-size=10240
read-only read-only
image=/install/powerpc/vmlinux image=/install/powerpc/vmlinux
label=rescue label=rescue
initrd=/install/powerpc/initrd.gz initrd=/install/powerpc/initrd.gz
append="rescue/enable=true --" append="rescue/enable=true ---"
initrd-size=10240 initrd-size=10240
read-only read-only
image=/install/powerpc/vmlinux image=/install/powerpc/vmlinux
label=auto label=auto
initrd=/install/powerpc/initrd.gz initrd=/install/powerpc/initrd.gz
append="auto=true priority=critical --" append="auto=true priority=critical ---"
initrd-size=10240 initrd-size=10240
read-only read-only

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
patch from Michael Vogt - thanks! patch from Michael Vogt - thanks!
* Add 586 kernels to replace 486 for i386 CDs * Add 586 kernels to replace 486 for i386 CDs
* More tweaks for arm64 CD building * More tweaks for arm64 CD building
* Change from -- to --- for kernel command line handling.
Closes: #764676
-- Steve McIntyre <93sam@debian.org> Wed, 29 Oct 2014 17:33:10 +0000 -- Steve McIntyre <93sam@debian.org> Wed, 29 Oct 2014 17:33:10 +0000

2
tools/boot/jessie/boot-x86
View File

@ -369,7 +369,7 @@ if [ -n "$KERNEL_PARAMS" ]; then
instsel.cfg) instsel.cfg)
continue ;; continue ;;
esac esac
sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \ sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
$file $file
done done
fi fi