Hello community, here is the log from the commit of package installation-images checked in at Mon Jul 23 20:13:53 CEST 2007. -------- --- installation-images/installation-images.changes 2007-07-20 12:06:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-07-23 18:14:03.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 23 18:13:56 CEST 2007 - snwint@suse.de + +- moved 'install - XXX' variants into submenu, added 'repair' entry (#293827) + +------------------------------------------------------------------- Old: ---- installation-images-9.89.tar.bz2 New: ---- installation-images-9.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.V13799/_old 2007-07-23 20:09:22.000000000 +0200 +++ /var/tmp/diff_new_pack.V13799/_new 2007-07-23 20:09:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 9.89) +# spec file for package installation-images (Version 9.90) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -67,9 +67,9 @@ Obsoletes: y2image Autoreqprov: off Summary: Installation Image Files -Version: 9.89 +Version: 9.90 Release: 1 -Source: installation-images-9.89.tar.bz2 +Source: installation-images-9.90.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -345,6 +345,8 @@ /CD1 %changelog +* Mon Jul 23 2007 - snwint@suse.de +- moved 'install - XXX' variants into submenu, added 'repair' entry (#293827) * Fri Jul 20 2007 - snwint@suse.de - use perl-XML-Bare * Mon Jul 16 2007 - snwint@suse.de ++++++ installation-images-9.89.tar.bz2 -> installation-images-9.90.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.89/Changelog new/installation-images-9.90/Changelog --- old/installation-images-9.89/Changelog 2007-07-20 12:05:18.000000000 +0200 +++ new/installation-images-9.90/Changelog 2007-07-23 15:56:43.000000000 +0200 @@ -1,3 +1,6 @@ +23/7/2007: v9.90 + - moved 'install - XXX' variants into submenu, added 'repair' entry (#293827) + 20/7/2007: v9.89 - use perl-XML-Bare diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.89/data/boot/syslinux.cfg new/installation-images-9.90/data/boot/syslinux.cfg --- old/installation-images-9.89/data/boot/syslinux.cfg 2006-09-25 15:43:58.000000000 +0200 +++ new/installation-images-9.90/data/boot/syslinux.cfg 2007-07-23 15:55:41.000000000 +0200 @@ -9,20 +9,10 @@ kernel linux append initrd=initrd splash=silent showopts -# noacpi -label noacpi +# repair +label repair kernel linux - append initrd=initrd splash=silent showopts acpi=off - -# nolapic -label nolapic - kernel linux - append initrd=initrd splash=silent showopts nolapic - -# failsafe -label failsafe - kernel linux - append initrd=initrd splash=silent showopts apm=off acpi=off mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare irqpoll pci=nommconf + append initrd=initrd splash=silent repair=1 showopts # rescue label rescue diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.89/data/root/repair.diff new/installation-images-9.90/data/root/repair.diff --- old/installation-images-9.89/data/root/repair.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-9.90/data/root/repair.diff 2007-07-23 17:59:15.000000000 +0200 @@ -0,0 +1,30 @@ +--- usr/lib/YaST2/startup/First-Stage/F09-start ++++ usr/lib/YaST2/startup/First-Stage/F09-start +@@ -45,7 +45,11 @@ + rm -f /var/X11R6/bin/X + rm -f /tmp/YaST2_ssh_installation_finished + log "\tDelegate program call to YaST2.call installation initial" +-/usr/lib/YaST2/startup/YaST2.call installation initial ++if grep -q repair=1 /proc/cmdline ; then ++ /usr/lib/YaST2/startup/YaST2.call repair ++else ++ /usr/lib/YaST2/startup/YaST2.call installation initial ++fi + yast2exitcode=$? + + #============================================= +--- usr/lib/YaST2/startup/YaST2.call ++++ usr/lib/YaST2/startup/YaST2.call +@@ -836,7 +836,11 @@ + # 8) Call YaST2 + #--------------------------------------------- + Y2_MODULE_NAME=${1:-installation}; shift +-Y2_MODULE_ARGS=\(\"$*\"\) ++if [ -z "$*" ] ; then ++ Y2_MODULE_ARGS= ++else ++ Y2_MODULE_ARGS=\(\"$*\"\) ++fi + start_yast + + #============================================= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.89/data/root/root.file_list new/installation-images-9.90/data/root/root.file_list --- old/installation-images-9.89/data/root/root.file_list 2007-07-20 11:04:50.000000000 +0200 +++ new/installation-images-9.90/data/root/root.file_list 2007-07-23 18:00:10.000000000 +0200 @@ -374,6 +374,9 @@ / # back to fullscreen - netpbm tools are in machbunt.file_list r /usr/lib/YaST2/startup/InstallImages/* + # hack to make 'repair' option work + p repair.diff + yast2-iscsi-client: / yast2-mouse: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.89/VERSION new/installation-images-9.90/VERSION --- old/installation-images-9.89/VERSION 2007-07-20 12:05:22.000000000 +0200 +++ new/installation-images-9.90/VERSION 2007-07-23 15:55:55.000000000 +0200 @@ -1 +1 @@ -9.89 +9.90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org