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

Bug#678066: marked as done (Proposal to simplify PowerPC CD/DVD boot options)



Your message dated Fri, 24 Aug 2012 14:47:43 +0000
with message-id <E1T4vAl-0004uW-0B@franck.debian.org>
and subject line Bug#678066: fixed in debian-cd 3.1.10
has caused the Debian Bug report #678066,
regarding Proposal to simplify PowerPC CD/DVD boot options
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 owner@bugs.debian.org
immediately.)


-- 
678066: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678066
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: debian-cd
Tags: patch d-i wheezy
Severity: wishlist


Hello,

I would like to propose a slight change in the way PowerPC CD/DVD boots.

CD/DVD boot-script, which runs on PowerPC Mac machines, can detect whether it runs on 32-bit or 64-bit processor, then offer boot options accordingly. This proposed change makes 32-bit Macs offer 32-bit boot options only. Therefore, pressing ENTER or typing 'install' would load 32-bit kernel. On the other hand, 64-bit PowerPC Macs and IBM CHRP machines would offer 64-bit boot options by default. Therefore, pressing ENTER or typing 'install' would load 64-bit kernel, but it would also offer 32-bit boot options such as install32 or expert32.

Attached diff introduces two new files:

boot32.msg - Boot prompt for 32-bit Macs.
mac32.conf - Options offered on 32-bit Macs.

Diff stats:

data/wheezy/yaboot/boot.msg    |   18 +++++------
data/wheezy/yaboot/boot32.msg  |   16 ++++++++++
data/wheezy/yaboot/mac32.conf  |   35 ++++++++++++++++++++++
data/wheezy/yaboot/ofboot.b    |    9 +++++
data/wheezy/yaboot/yaboot.conf |   54 +++++++++++++++-------------------
tools/boot/wheezy/boot-powerpc |   30 ++++++++++++------
6 files changed, 113 insertions(+), 49 deletions(-)

Any comments?

Milan
Index: data/wheezy/yaboot/mac32.conf
===================================================================
--- data/wheezy/yaboot/mac32.conf	(revision 0)
+++ data/wheezy/yaboot/mac32.conf	(revision 0)
@@ -0,0 +1,35 @@
+## This file is for CD booting only, do not use as reference.
+## Debian GNU/Linux PowerPC (CODENAME)
+
+default=install
+message=/install/boot32.msg
+
+# 32-bit PowerPC subarch 
+
+image=/install/powerpc/vmlinux
+	label=install
+	initrd=/install/powerpc/initrd.gz
+	append="--"
+	initrd-size=10240
+	read-only
+
+image=/install/powerpc/vmlinux
+	label=expert
+	initrd=/install/powerpc/initrd.gz
+	append="priority=low --"
+	initrd-size=10240
+	read-only
+
+image=/install/powerpc/vmlinux
+	label=rescue
+	initrd=/install/powerpc/initrd.gz
+	append="rescue/enable=true --"
+	initrd-size=10240
+	read-only
+
+image=/install/powerpc/vmlinux
+	label=auto
+	initrd=/install/powerpc/initrd.gz
+	append="auto=true priority=critical --"
+	initrd-size=10240
+	read-only
Index: data/wheezy/yaboot/boot32.msg
===================================================================
--- data/wheezy/yaboot/boot32.msg	(revision 0)
+++ data/wheezy/yaboot/boot32.msg	(revision 0)
@@ -0,0 +1,16 @@
+Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
+
+This is a Debian installation ${MEDIA_TYPE},
+built on ${BUILD_DATE}.
+
+
+Press ENTER to continue, or press TAB for a
+full list of options.
+
+
+If the system fails to boot with a white screen
+which doesn't go away, type: 
+
+install video=ofonly 
+
+
Index: data/wheezy/yaboot/yaboot.conf
===================================================================
--- data/wheezy/yaboot/yaboot.conf	(revision 2346)
+++ data/wheezy/yaboot/yaboot.conf	(working copy)
@@ -1,70 +1,66 @@
 ## This yaboot.conf is for CD booting only, do not use as reference.
 ## Debian GNU/Linux PowerPC (CODENAME)
 
-# It is important not to have a comma after cd:
-# Let's disable this one for now, as it breaks on IBM 64bit boxes,
-# Not sure if it is ok on powermacs, but yaboot should be able to 
-# parse that from chosen/bootpath.
-# device=cd:
 default=install
-
-# FIXME: will this be the correct path?
 message=/install/boot.msg
 
-# PowerPC subarch 
-image=/install/powerpc/vmlinux
+# 64-bit PowerPC subarch
+
+image=/install/powerpc64/vmlinux
 	label=install
-	initrd=/install/powerpc/initrd.gz
+	initrd=/install/powerpc64/initrd.gz
 	append="--"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc/vmlinux
+image=/install/powerpc64/vmlinux
 	label=expert
-	initrd=/install/powerpc/initrd.gz
+	initrd=/install/powerpc64/initrd.gz
 	append="priority=low --"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc/vmlinux
+image=/install/powerpc64/vmlinux
 	label=rescue
-	initrd=/install/powerpc/initrd.gz
+	initrd=/install/powerpc64/initrd.gz
 	append="rescue/enable=true --"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc/vmlinux
+image=/install/powerpc64/vmlinux
 	label=auto
-	initrd=/install/powerpc/initrd.gz
+	initrd=/install/powerpc64/initrd.gz
 	append="auto=true priority=critical --"
 	initrd-size=10240
 	read-only
 
-# PowerPC 64bit subarch
-image=/install/powerpc64/vmlinux
-	label=install64
-	initrd=/install/powerpc64/initrd.gz
+
+# 32-bit PowerPC subarch 
+
+image=/install/powerpc/vmlinux
+	label=install32
+	initrd=/install/powerpc/initrd.gz
 	append="--"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc64/vmlinux
-	label=expert64
-	initrd=/install/powerpc64/initrd.gz
+image=/install/powerpc/vmlinux
+	label=expert32
+	initrd=/install/powerpc/initrd.gz
 	append="priority=low --"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc64/vmlinux
-	label=rescue64
-	initrd=/install/powerpc64/initrd.gz
+image=/install/powerpc/vmlinux
+	label=rescue32
+	initrd=/install/powerpc/initrd.gz
 	append="rescue/enable=true --"
 	initrd-size=10240
 	read-only
 
-image=/install/powerpc64/vmlinux
-	label=auto64
-	initrd=/install/powerpc64/initrd.gz
+image=/install/powerpc/vmlinux
+	label=auto32
+	initrd=/install/powerpc/initrd.gz
 	append="auto=true priority=critical --"
 	initrd-size=10240
 	read-only
Index: data/wheezy/yaboot/boot.msg
===================================================================
--- data/wheezy/yaboot/boot.msg	(revision 2346)
+++ data/wheezy/yaboot/boot.msg	(working copy)
@@ -3,16 +3,16 @@
 This is a Debian installation ${MEDIA_TYPE},
 built on ${BUILD_DATE}.
 
+
 Enter one of the following options to begin:
 
-install     32-bit processor (G4 or earlier)
-install64   64-bit processor (G5 or IBM POWER3/4/5)
-expert      expert mode on 32-bit processor
-expert64    expert mode on 64-bit processor
+install     64-bit processor (G5 or POWER3/4/5/6/7)
+install32   32-bit processor (G4 or earlier)
 
-If the system fails to boot at all (the typical
-symptom is a white screen which doesn't go away),
-add 'video=ofonly'.
+Press TAB for a full list of options.
 
-Press the Tab key for a full list of options, or enter
-'help' for help.
+
+If the system fails to boot with a white screen
+which doesn't go away, add 'video=ofonly'.
+
+
Index: data/wheezy/yaboot/ofboot.b
===================================================================
--- data/wheezy/yaboot/ofboot.b	(revision 2346)
+++ data/wheezy/yaboot/ofboot.b	(working copy)
@@ -8,7 +8,14 @@
 <BOOT-SCRIPT>
 " screen" output
 load-base release-load-area
-boot cd:,\install\yaboot
+" /cpus/@0" find-package if
+ " 64-bit" rot get-package-property 0= if
+  2drop
+  " boot cd:,\install\yaboot conf=cd:,\install\yaboot.conf" eval
+ else
+  " boot cd:,\install\yaboot conf=cd:,\install\mac32.conf" eval
+ then
+then
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 1010
Index: tools/boot/wheezy/boot-powerpc
===================================================================
--- tools/boot/wheezy/boot-powerpc	(revision 2346)
+++ tools/boot/wheezy/boot-powerpc	(working copy)
@@ -75,16 +75,7 @@
 #
 # generate/download images for "powerpc"
 # (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img)
-cat $BASEDIR/data/$DI_CODENAME/yaboot/boot.msg \
- | sed "s/\${MEDIA_TYPE}/CDROM/" \
- | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
- | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
- > boot.msg
-cat $BASEDIR/data/$DI_CODENAME/yaboot/yaboot.conf \
- | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
-if [ -n "$KERNEL_PARAMS" ]; then
-    sed -i "/^[[:space:]]\+append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" yaboot.conf
-fi
+
 cp $BASEDIR/data/$DI_CODENAME/yaboot/ofboot.b ofboot.b
 
 for subarch in powerpc powerpc64 #prep
@@ -92,11 +83,30 @@
   case $subarch in
     powerpc|prep)
       bitness=
+      yabootconf=mac32.conf
+      yabootmsg=boot32.msg
       ;;
     powerpc64)
       bitness=64
+      yabootconf=yaboot.conf
+      yabootmsg=boot.msg
       ;;
   esac
+
+  cat $BASEDIR/data/$DI_CODENAME/yaboot/$yabootconf \
+   | sed "s/CODENAME/${CODENAME}/g" \
+   > $yabootconf
+
+  cat $BASEDIR/data/$DI_CODENAME/yaboot/$yabootmsg \
+   | sed "s/\${MEDIA_TYPE}/CDROM/" \
+   | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
+   | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
+   > $yabootmsg
+
+  if [ -n "$KERNEL_PARAMS" ]; then
+      sed -i "/^[[:space:]]\+append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" $yabootconf
+  fi
+
   if [ ! "$DI_WWW_HOME" ];then
         if [ ! "$DI_DIR" ];then 
            DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"

--- End Message ---
--- Begin Message ---
Source: debian-cd
Source-Version: 3.1.10

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 678066@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Steve McIntyre <93sam@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 ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 24 Aug 2012 14:50:13 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.10
Distribution: unstable
Urgency: low
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description: 
 debian-cd  - Tools for building (Official) Debian CD set
Closes: 678066 678883
Changes: 
 debian-cd (3.1.10) unstable; urgency=low
 .
   [ Steve McIntyre ]
   * Don't exclude all the udebs for s390. Some users really do need them
     (loading from a CD/DVD used over the network). Closes: Bug #673576
   * Explicitly add s390-tools and sysconfig-hardware for s390.
   * Tweak sort_deps:
     + Track whether a dependency chain is caused by a hard dependency
       (Depends) or soft (Recommends/Suggests). If we fail to add a package
       down the chain on a *soft* dependency, don't invalidate the entire
       chain.
     + When checking OR dependencies, *first* check to see if any of the
       options are already installed *before* trying to install the first
       option. Helps a lot with circular deps such as task-lxde-desktop ->
       task-desktop -> (task-gnome-desktop | task-lxde-desktop | etc.); in
       this case, of course task-lxde-desktop should satisfy the OR dep.
   * Tweak powerpc boot options, using 32/64 bit detection in yaboot at
     boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
   * Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
     Thanks to Stephan Schreiber for the patch. Tweak all the other
     ElTorito-booting arches in a similar fashion.
 .
   [ Joey Hess ]
   * Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
     menu (pulled in by desktop tasks),
     aptitude (pulled in by debootstap, and may be demoted to optional),
     alsa-utils, alsa-base (pulled in by task-desktop),
     mdetect, read-edid (no longer used by xorg),
     grub (handed by generate_di+k_list),
     deborphan, debfoster, localepurge (expert user stuff),
     chdrvfont (no such package any more),
     discover, popularity-contest, wpasupplicant, openssh-server
     (in generate_di+k_list),
     gnupg (pulled in by debootstrap)
   * Updated generate_di+k_list to match more closely the current
     packages d-i apt-installs.
   * Further trim forcd1, removing lots of historical cruft, and adding
     comments explaining the rationalle for the remaining packages.
Checksums-Sha1: 
 18a4d9d135df2275a82d7b09e837448e4e3bbb05 1680 debian-cd_3.1.10.dsc
 7c8079c4d6fb27fce62d3c7b7a4283a8e0417eeb 850245 debian-cd_3.1.10.tar.gz
 786062aece3221eb8d63ef8f8ccdf258caf92ec8 857386 debian-cd_3.1.10_all.deb
Checksums-Sha256: 
 21facac7feed27da461728398e2a73425a9cd2bf8b3cbd96771443a660f50c4f 1680 debian-cd_3.1.10.dsc
 2deef28bfb3c4facdf3de61d6c0820b66e832ccbc404f54cda3a8d8add054449 850245 debian-cd_3.1.10.tar.gz
 e552391ba06fc6e64b27ceece9efa99f53855048d7a975c2b72ea1881079eb37 857386 debian-cd_3.1.10_all.deb
Files: 
 681b48e91aae98ce1229d2dbe0fd0fca 1680 admin extra debian-cd_3.1.10.dsc
 97ae62a79a9368ac59716928d565535d 850245 admin extra debian-cd_3.1.10.tar.gz
 55954141677c7a3bca5460bc014c4afc 857386 admin extra debian-cd_3.1.10_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQN4g9AAoJEFh5eVc0QmhOOF8P/iwojYFQuaYZ7YLM5A1EMesB
sxM9f2mHkjAGgXJj780NaPuaYW7zTpuyTbnU5iRaxbK7bc5duDNc9sgMuZ6hUz+r
9WoebaEeg2CtWQWOSYuJDSmLNrp/s9MrFhO9iL5YYcSnD01jlUL7JQRwjBtnCwZF
SM/5MzdXWGAEccZL5j21RcTfswseCpKFMpCaThhCA6h1iMja0FcC8qtI9JnsfyMK
2YEnwbKiJVvWLGUOO9QEwgE1RUnBhiQUZY2UMfDERlXHAhTH9UrmlIgRxdY2FvrD
/9KbVdClWqFlk+mPMbgPfdEiYwK16EMOhw/S07sahKArQeOPF3+71K8m5Y1sJtdv
qQM6apRZQv32sWG2aglqITk0VQAVOwbXycqUWo71DWA+m4PjdUY4L36ypwF/uo06
6MawlOSHZqTysyfP7vYDHOMoau8564Qvs0arMxwhg0gdOsvCprLl3rzTg9bphuuS
8RcWMHwvqgL/3mGlCeH+JQKeGJtUyspdReNKSarOYEpHpuoK9GICD/e0Kuo7xFjL
7TFHMbewnaIPs+djLUIHTKtnHnNMQTVIhdNbQ+ndlj8LqzsR2BE1+/aHURP9SDYi
H6a40QGgGHmPQv3tKCXhbHz6G5Rod6LimMhAf72aJvzVxs+O/l51kma6JChnTqWm
3atqxaeI454oCnsLFeIl
=Wfgf
-----END PGP SIGNATURE-----

--- End Message ---

Reply to: