Bug#706150: marked as done (Build without isolinux/desktop)

2014-01-14 Thread Debian Bug Tracking System 
Your message dated Tue, 14 Jan 2014 17:33:22 +
with message-id e1w37re-0004rt...@franck.debian.org
and subject line Bug#706150: fixed in debian-cd 3.1.14
has caused the Debian Bug report #706150,
regarding Build without isolinux/desktop
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
706150: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706150
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---

Package: debian-cd
Version: 3.1.12

I'm building custom server install ISOs, installing a desktop is 
unnecessary and unneeded. debian-cd currently expects there to always be 
isolinux/desktop/* files and a dtmenu.cfg file, failing if they are missing.


The attached patch file makes it so debian-cd can cope whether those 
files are present or not.


--
Robert Spencer
--- tools/boot/squeeze/boot-x86~	2011-02-22 20:52:44.0 +
+++ tools/boot/squeeze/boot-x86	2013-04-25 12:50:20.0 +
@@ -269,17 +269,14 @@
 
 if [ -z $MULTIARCH ]; then
 	# Set up isolinux dir for only the current arch
-	sed -i s|%install%|$INSTALLDIR| \
-		boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i s|%install%|$INSTALLDIR|
 
 	# Remove the amd*.cfg files to avoid them being loaded on a
 	# disc that does not have both amd64 and i386 dirs.
-	rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+	find boot$N/isolinux/ -name amd*.cfg -delete
 else
 	# Set up isolinux dir for multi-arch
-	sed -i s|%install%|$INSTALLDIR_i386|
-			s|%install-amd%|$INSTALLDIR_amd64| \
-			boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e s|%install%|$INSTALLDIR_i386| -e s|%install-amd%|$INSTALLDIR_amd64|
 
 	for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
 		sed -i 4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/ $file
--- tools/boot/squeeze/x86-desktop.sh~	2009-05-31 23:53:55.0 +
+++ tools/boot/squeeze/x86-desktop.sh	2013-04-25 12:59:18.0 +
@@ -22,8 +22,10 @@
 		boot$N/isolinux/amdtxt.cfg || true
 	sed -i /^include menu.cfg/ a\include instsel.cfg \
 		boot$N/isolinux/prompt.cfg
-	sed -i /^default install/ a\include instsel.cfg \
-		boot$N/isolinux/desktop/prompt.cfg
+	if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+		sed -i /^default install/ a\include instsel.cfg \
+			boot$N/isolinux/desktop/prompt.cfg
+	fi
 	cat boot$N/isolinux/instsel.cfg EOF
 default install-select
 label install-select
@@ -48,8 +50,8 @@
 
 modify_for_single_desktop() {
 	# Cleanup
-	rm boot$N/isolinux/dtmenu.cfg
-	rm -r boot$N/isolinux/desktop
+	rm -f boot$N/isolinux/dtmenu.cfg
+	rm -fr boot$N/isolinux/desktop
 
 	# Set default desktop, or remove if not applicable
 	if [ $DESKTOP ]; then
--- tools/boot/wheezy/boot-x86~	2013-03-24 20:13:25.0 +
+++ tools/boot/wheezy/boot-x86	2013-04-25 12:00:42.0 +
@@ -284,17 +284,14 @@
 
 if [ -z $MULTIARCH ]; then
 	# Set up isolinux dir for only the current arch
-	sed -i s|%install%|$INSTALLDIR| \
-		boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i s|%install%|$INSTALLDIR|
 
 	# Remove the amd*.cfg files to avoid them being loaded on a
 	# disc that does not have both amd64 and i386 dirs.
-	rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+	find boot$N/isolinux/ -name amd*.cfg -delete
 else
 	# Set up isolinux dir for multi-arch
-	sed -i s|%install%|$INSTALLDIR_i386|
-			s|%install-amd%|$INSTALLDIR_amd64| \
-			boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e s|%install%|$INSTALLDIR_i386| -e s|%install-amd%|$INSTALLDIR_amd64|
 
 	for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
 		sed -i 4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/ $file
--- tools/boot/wheezy/x86-desktop.sh~	2009-05-31 23:53:55.0 +
+++ tools/boot/wheezy/x86-desktop.sh	2013-04-25 11:54:58.0 +
@@ -22,8 +22,10 @@
 		boot$N/isolinux/amdtxt.cfg || true
 	sed -i /^include menu.cfg/ a\include instsel.cfg \
 		boot$N/isolinux/prompt.cfg
-	sed -i /^default install/ a\include instsel.cfg \
-		boot$N/isolinux/desktop/prompt.cfg
+	if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+		sed -i /^default install/ a\include instsel.cfg \
+			boot$N/isolinux/desktop/prompt.cfg
+	fi
 	cat boot$N/isolinux/instsel.cfg EOF
 default install-select
 label install-select
@@ -48,8 +50,8 @@

Bug#706156: marked as done (Don't assume loadlin.exe exists)

2014-01-14 Thread Debian Bug Tracking System 
Your message dated Tue, 14 Jan 2014 17:33:22 +
with message-id e1w37re-0004rf...@franck.debian.org
and subject line Bug#706156: fixed in debian-cd 3.1.14
has caused the Debian Bug report #706156,
regarding Don't assume loadlin.exe exists
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
706156: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706156
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---

Package: debian-cd
Version: 3.1.12

I'm making a custom server netinstall ISO, so there are no MS Windows 
files and no need for them. Unfortunately there's currently no check for 
loadlin.exe, so install.bat gets created regardless.


The attached patch file fixes this.

--
Robert Spencer
--- tools/boot/squeeze/boot-x86~	2011-02-22 20:52:44.0 +
+++ tools/boot/squeeze/boot-x86	2013-04-25 15:20:38.0 +
@@ -177,7 +177,9 @@
 mkdir -p $CDDIR/$INSTALLDIR
 cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
 cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-echo \\tools\\loadlin.exe vmlinuz initrd=initrd.gz | todos  $CDDIR/$INSTALLDIR/install.bat
+if [ -e $CDDIR/tools/loadlin.exe ]; then
+	echo \\tools\\loadlin.exe vmlinuz initrd=initrd.gz | todos  $CDDIR/$INSTALLDIR/install.bat
+fi
 
 mkdir -p $CDDIR/../syslinux
 SYSLINUXDEB=$(find_pkg_file syslinux)
@@ -245,8 +247,9 @@
 	if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then
 		mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg
 	fi
-	echo \\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788 | todos  $CDDIR/$INSTALLDIR/gtk/install.bat
-
+	if [ -e $CDDIR/tools/loadlin.exe ]; then
+		echo \\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788 | todos  $CDDIR/$INSTALLDIR/gtk/install.bat
+	fi
 fi
 rm -f boot$N/isolinux/isolinux.cfg.with*
 
--- tools/boot/wheezy/boot-x86~	2013-03-24 20:13:25.0 +
+++ tools/boot/wheezy/boot-x86	2013-04-25 15:20:38.0 +
@@ -186,7 +186,9 @@
 mkdir -p $CDDIR/$INSTALLDIR
 cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
 cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-echo \\tools\\loadlin.exe vmlinuz initrd=initrd.gz | todos  $CDDIR/$INSTALLDIR/install.bat
+if [ -e $CDDIR/tools/loadlin.exe ]; then
+	echo \\tools\\loadlin.exe vmlinuz initrd=initrd.gz | todos  $CDDIR/$INSTALLDIR/install.bat
+fi
 
 mkdir -p $CDDIR/../syslinux
 SYSLINUXDEB=$(find_pkg_file syslinux)
@@ -255,8 +257,9 @@
 	if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then
 		mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg
 	fi
-	echo \\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788 | todos  $CDDIR/$INSTALLDIR/gtk/install.bat
-
+	if [ -e $CDDIR/tools/loadlin.exe ]; then
+		echo \\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788 | todos  $CDDIR/$INSTALLDIR/gtk/install.bat
+	fi
 fi
 rm -f boot$N/isolinux/isolinux.cfg.with*
 
---End Message---
---BeginMessage---
Source: debian-cd
Source-Version: 3.1.14

We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 706...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Steve McIntyre 93...@debian.org (supplier of updated debian-cd package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 14 Jan 2014 17:19:22 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.14
Distribution: unstable
Urgency: medium
Maintainer: Debian CD Group debian-cd@lists.debian.org
Changed-By: Steve McIntyre 93...@debian.org
Description: 
 debian-cd  - Tools for building (Official) Debian CD set
Closes: 706150 706156
Changes: 
 debian-cd (3.1.14) unstable; urgency=medium
 .
   [ Steve McIntyre ]
   * Start jessie work; copy things from the wheezy config for now.
   * Remove older squeeze, lenny, etch dirs
   * Move code hosting from svn to git.
   * Make sure that when we call apt, we tell it to *not* use localised
 package descriptions; this causes issues during build. See #712435 in
 apt.
   * List Translation files in dists/$dist/Release too - apt looks there
 now instead of in Index, apparently.
   * Remove mention/support

Processing of debian-cd_3.1.14_amd64.changes

2014-01-14 Thread Debian FTP Masters 
debian-cd_3.1.14_amd64.changes uploaded successfully to localhost
along with the files:
  debian-cd_3.1.14.dsc
  debian-cd_3.1.14.tar.gz
  debian-cd_3.1.14_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w37lc-0003mf...@franck.debian.org