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

sparc: ensure the default 'install' option also gets KERNEL_PARAMS set 

The current code will add KERNEL_PARAMS only for boot options that have
an existing "append=" line, but that leaves the default option without it.
This commit is contained in:
Frans Pop 2009-01-20 00:39:09 +00:00
parent 1477ac67b6
commit 33ec58d1a5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
debian-cd (3.1.1) UNRELEASED; urgency=low debian-cd (3.1.1) UNRELEASED; urgency=low
* sparc: remove bogus default "append=cdrom" line from silo.conf template. * sparc: remove bogus default "append=cdrom" line from silo.conf template.
* sparc: ensure the default 'install' option also gets KERNEL_PARAMS set.
-- Frans Pop <fjp@debian.org> Tue, 20 Jan 2009 01:30:11 +0100 -- Frans Pop <fjp@debian.org> Tue, 20 Jan 2009 01:30:11 +0100

9
tools/boot/lenny/boot-sparc
View File

@ -49,7 +49,14 @@ $BASEDIR/tools/which_deb $MIRROR $DI_CODENAME silo source >> $CDDIR/../$N.pkgs_e
# Some custom etc files # Some custom etc files
cp -f -p $BASEDIR/data/lenny/sparc/silo.conf $inst/boot/ cp -f -p $BASEDIR/data/lenny/sparc/silo.conf $inst/boot/
if [ -n "$KERNEL_PARAMS" ]; then if [ -n "$KERNEL_PARAMS" ]; then
sed -i "/^[[:space:]]\+append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" $inst/boot/silo.conf # Add KERNEL_PARAMS to any existing append line
sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \
$inst/boot/silo.conf
# If there is no default append= line, add it
if ! grep -q "^append=" $inst/boot/silo.conf; then
sed -i "/^default=/ a\append=\"$KERNEL_PARAMS\"" \
$inst/boot/silo.conf
fi
fi fi
cat $BASEDIR/data/lenny/sparc/debian.txt \ cat $BASEDIR/data/lenny/sparc/debian.txt \
| sed "s/\${MEDIA_TYPE}/CDROM/" \ | sed "s/\${MEDIA_TYPE}/CDROM/" \