[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Removal of user mount hack / root requirement for building debian installer



Hi.

In
<http://lists.debian.org/debian-boot/2003/debian-boot-200306/msg00359.html>
I suggested a patch to make use of syslinux's new capability to write to
unmounted images in order to be able to build as normal user.
A oneliner to allow older sed versions to be used (seperate module names by " "
instead of "\n") was also included.
I've attached an updated patch.

Is this entirely unattractive or just not a priority right now?
If the latter is the case, which would be the most appropriate package to file
wishlist bugs against?

Cheers

T.
--- linux-i386.orig	Sun Jul 13 10:44:02 2003
+++ linux-i386	Sun Jul 13 10:44:02 2003
@@ -8,31 +8,12 @@
 	dd if=/dev/zero of=$@.new bs=1k count=$(FLOPPY_SIZE)
 	mkfs.msdos -i deb00001 -n 'Debian Installer' -C $@.new $(FLOPPY_SIZE)
 
-ifdef USER_MOUNT_HACK
-	ln -sf `pwd`/$@.new $(USER_MOUNT_HACK)
-	mount $(TMP_MNT)
-else
-	mount -t vfat -o loop $@.new $(TMP_MNT)
-endif
-
-	# syslinux is used to make the floppy bootable.
-	if $(foreach NAME,$(KERNELNAME), \
-             cp -f $(TEMP)/$(NAME) $(TMP_MNT)/linux) \
-	   && cp $(INITRD) $(TMP_MNT)/initrd.gz \
-	   && cp boot/i386/syslinux.cfg $(TMP_MNT)/ \
-	   && todos $(TMP_MNT)/syslinux.cfg ; \
-	then \
-		umount $(TMP_MNT) ; \
-		true ; \
-	else \
-		umount $(TMP_MNT) ; \
-		false ; \
-	fi
-
-ifdef USER_MOUNT_HACK
-	syslinux $(SYSLINUX_OPTS) $(USER_MOUNT_HACK)
-	rm -f $(USER_MOUNT_HACK)
-else
+	# syslinux is used to make the floppy bootable
+	$(foreach NAME,$(KERNELNAME), \
+             mcopy -i$@.new $(TEMP)/$(NAME) ::\linux \
+	   && mcopy -i$@.new $(INITRD) ::\initrd.gz \
+	   && todos < boot/i386/syslinux.cfg |  \
+	        mcopy -i$@.new - ::\syslinux.cfg)
 	syslinux $(SYSLINUX_OPTS) $@.new
 endif
 
--- build/Makefile~	Sat Jun 14 17:18:20 2003
+++ build/Makefile	Sat Jun 14 17:20:46 2003
@@ -49,7 +49,7 @@
 			pkg-lists/base \
 			pkg-lists/$(TYPE)/common \
 			`if [ -f pkg-lists/$(TYPE)/$(DEB_HOST_ARCH) ]; then echo pkg-lists/$(TYPE)/$(DEB_HOST_ARCH); fi` \
-		| sed -e 's/^\(.*\)$${kernel:Version}\(.*\)$$/$(foreach VERSION,$(KERNELIMAGEVERSION),\1$(VERSION)\2\n)/g' \
+		| sed -e 's/^\(.*\)$${kernel:Version}\(.*\)$$/$(foreach VERSION,$(KERNELIMAGEVERSION),\1$(VERSION)\2 )/g' \
 	) $(EXTRAS)
 # Scratch directory.
 BASE_TMP=./tmp/

Attachment: pgpsIiuwHj_qa.pgp
Description: PGP signature


Reply to: