Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2014-01-30 06:54:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2014-01-29 07:14:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2014-01-30 06:54:07.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 29 15:49:17 CET 2014 - snwint@suse.de + +- build rescue-server + +------------------------------------------------------------------- Old: ---- installation-images-14.32.tar.bz2 New: ---- installation-images-14.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.jcfDsE/_old 2014-01-30 06:54:07.000000000 +0100 +++ /var/tmp/diff_new_pack.jcfDsE/_new 2014-01-30 06:54:07.000000000 +0100 @@ -390,9 +390,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 14.32 +Version: 14.33 Release: 0 -Source: installation-images-14.32.tar.bz2 +Source: installation-images-14.33.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.32.tar.bz2 -> installation-images-14.33.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/Makefile new/installation-images-14.33/Makefile --- old/installation-images-14.32/Makefile 2014-01-22 14:41:22.000000000 +0100 +++ new/installation-images-14.33/Makefile 2014-01-29 15:13:39.000000000 +0100 @@ -15,7 +15,7 @@ endif ifneq ($(filter x86_64, $(ARCH)),) -ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot-grub2-efi boot boot-themes $(COMMON_TARGETS) +ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot-grub2-efi boot boot-themes $(COMMON_TARGETS) rescue-server INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS) BOOT_PARTS := boot/* initrd biostest efi endif @@ -160,6 +160,9 @@ # rescue ok? (bnc #457947) @[ -s tmp/rescue/etc/init.d/boot.d/S*.udev ] || ( echo "build does not work on xxx" ; false ) +rescue-server: + libdeps=rescue image=rescue-server src=rescue filelist=rescue-server fs=squashfs bin/mk_image + root+rescue: base image=root+rescue fs=none bin/mk_image bin/common_tree --dst tmp/root+rescue tmp/rescue tmp/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/VERSION new/installation-images-14.33/VERSION --- old/installation-images-14.32/VERSION 2014-01-28 10:20:22.000000000 +0100 +++ new/installation-images-14.33/VERSION 2014-01-29 15:49:09.000000000 +0100 @@ -1 +1 @@ -14.32 +14.33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/changelog new/installation-images-14.33/changelog --- old/installation-images-14.32/changelog 2014-01-28 10:20:26.000000000 +0100 +++ new/installation-images-14.33/changelog 2014-01-29 15:49:13.000000000 +0100 @@ -1,4 +1,7 @@ -2014-01-28: HEAD +2014-01-29: HEAD + - build rescue-server + +2014-01-28: 14.32 - added dmapi.ko 2014-01-27: 14.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/data/boot/syslinux-rescue.cfg new/installation-images-14.33/data/boot/syslinux-rescue.cfg --- old/installation-images-14.32/data/boot/syslinux-rescue.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.33/data/boot/syslinux-rescue.cfg 2014-01-29 15:46:04.000000000 +0100 @@ -0,0 +1,11 @@ +default rescue + +# rescue +label rescue + kernel linux + append initrd=initrd splash=silent rescue=1 showopts + +ui gfxboot bootlogo message +implicit 1 +prompt 1 +timeout 600 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/data/rescue/rescue-server.file_list new/installation-images-14.33/data/rescue/rescue-server.file_list --- old/installation-images-14.32/data/rescue/rescue-server.file_list 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.33/data/rescue/rescue-server.file_list 2014-01-29 15:11:27.000000000 +0100 @@ -0,0 +1,9 @@ +include rescue.file_list + +# add other packages here + + + +# remove unnecessary files +r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/data/rescue/rescue.file_list new/installation-images-14.33/data/rescue/rescue.file_list --- old/installation-images-14.32/data/rescue/rescue.file_list 2014-01-27 12:04:05.000000000 +0100 +++ new/installation-images-14.33/data/rescue/rescue.file_list 2014-01-29 15:24:48.000000000 +0100 @@ -74,7 +74,6 @@ diffutils: dosfstools: ?dracut: -?mkinitrd: dump: e2fsprogs: file-magic: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.32/install.i386 new/installation-images-14.33/install.i386 --- old/installation-images-14.32/install.i386 2013-11-18 11:49:20.000000000 +0100 +++ new/installation-images-14.33/install.i386 2014-01-29 15:19:16.000000000 +0100 @@ -74,3 +74,14 @@ mkdir -p $DESTDIR/usr/share cp images/mini-iso-rmlist $DESTDIR/usr/share +if [ -f images/rescue-server ] ; then + t=openSUSE + [ -d $DESTDIR/branding/SLES ] && t=SLES + dst=$DESTDIR/usr/share/rescue-server/boot/x86_64 + mkdir -p $dst + cp images/rescue-server $dst + echo "rescue: rescue-server" >$dst/config + cp -a $DESTDIR/CD1/boot/$ARCH/loader $DESTDIR/branding/$t/CD1/boot/$ARCH/loader $dst + cp data/boot/syslinux-rescue.cfg $dst/loader/isolinux.cfg +fi + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org