diff --git a/debian/changelog b/debian/changelog index 63703e56..09a3dd24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ debian-cd (3.1.1) UNRELEASED; urgency=low * sparc: remove bogus default "append=cdrom" line from silo.conf template. + * sparc: ensure the default 'install' option also gets KERNEL_PARAMS set. -- Frans Pop Tue, 20 Jan 2009 01:30:11 +0100 diff --git a/tools/boot/lenny/boot-sparc b/tools/boot/lenny/boot-sparc index 095c7380..00c06f0f 100755 --- a/tools/boot/lenny/boot-sparc +++ b/tools/boot/lenny/boot-sparc @@ -49,7 +49,14 @@ $BASEDIR/tools/which_deb $MIRROR $DI_CODENAME silo source >> $CDDIR/../$N.pkgs_e # Some custom etc files cp -f -p $BASEDIR/data/lenny/sparc/silo.conf $inst/boot/ 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 cat $BASEDIR/data/lenny/sparc/debian.txt \ | sed "s/\${MEDIA_TYPE}/CDROM/" \