From 5f0a6d5f712e13b50c586010cae03739c3fcdf3d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 29 May 2009 11:38:18 +0200 Subject: [PATCH] Import patches-unapplied version 0.83 to ubuntu/karmic Imported using git-ubuntu import. Changelog parent: 4fd04035f367745f50cb56b8f4d23b3d4af37272 New changelog entries: * Don't fail if livecd.${FSS}.{kernel,initrd} already exist for some reason. --- debian/changelog | 7 +++++++ livecd.sh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b017336..0d96ab12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.83) karmic; urgency=low + + * Don't fail if livecd.${FSS}.{kernel,initrd} already exist for some + reason. + + -- Colin Watson Fri, 29 May 2009 11:38:18 +0200 + livecd-rootfs (0.82) karmic; urgency=low [ Loic Minier ] diff --git a/livecd.sh b/livecd.sh index cccecdac..7863a268 100755 --- a/livecd.sh +++ b/livecd.sh @@ -504,8 +504,8 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse if [ "$NUMKVERS" = 1 ]; then # only one kernel SUBARCH="${KVERS#*-*-}" - ln -s livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd - ln -s livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel + ln -sf livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd + ln -sf livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel fi case $TARGETARCH+$SUBARCH in powerpc+ps3)