Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2015-01-20 21:54:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2014-12-23 11:50:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2015-01-20 21:54:46.000000000 +0100
@@ -2 +2 @@
-Sun Dec 21 19:50:25 UTC 2014 - [email protected]
+Tue Jan 20 16:41:14 CET 2015 - [email protected]
@@ -4 +4,12 @@
-- new.patch for getting DVD with new kernel
+- openldap2-client may require binutils
+- 14.157
+
+-------------------------------------------------------------------
+Wed Jan 14 14:02:59 CET 2015 - [email protected]
+
+- xterm/xterm-bin package split
+- added function to handle update-alternatives
+- started to make zenworks work again
+- adjust to rubygem package naming mess
+- adjust to factory changes
+- 14.156
Old:
----
installation-images-14.155.tar.xz
new.patch
New:
----
installation-images-14.157.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.k1nOCf/_old 2015-01-20 21:54:47.000000000 +0100
+++ /var/tmp/diff_new_pack.k1nOCf/_new 2015-01-20 21:54:47.000000000 +0100
@@ -360,11 +360,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.155
+Version: 14.157
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
-Patch0: new.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -400,7 +399,6 @@
%prep
%setup -n installation-images-%{version}
-%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-14.155.tar.xz -> installation-images-14.157.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/Makefile
new/installation-images-14.157/Makefile
--- old/installation-images-14.155/Makefile 2014-12-11 09:09:40.000000000
+0100
+++ new/installation-images-14.157/Makefile 2015-01-20 16:38:52.000000000
+0100
@@ -19,7 +19,7 @@
endif
ifneq ($(filter x86_64, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel
boot-grub2-efi boot boot-themes $(COMMON_TARGETS) rescue-server
+ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel
boot-grub2-efi boot boot-themes $(COMMON_TARGETS) rescue-server zenroot
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := boot/* initrd biostest efi
endif
@@ -61,7 +61,7 @@
.PHONY: all dirs base fbase biostest initrd \
boot boot-efi root rescue root+rescue gdb bind clean \
- boot-themes initrd-themes root-themes install \
+ boot-themes initrd-themes root-themes zenroot install \
install-initrd mini-iso-rmlist debuginfo cd1
all: $(ALL_TARGETS) VERSION changelog
@@ -173,9 +173,6 @@
cp data/root/config images
cat data/root/rpmlist tmp/base/yast2-trans-rpm.list >images/rpmlist
-sax2: base
- libdeps=root,sax2 image=sax2 src=root fs=squashfs disjunct=root
bin/mk_image
-
gdb: base
libdeps=root,gdb image=gdb src=root fs=squashfs disjunct=root
bin/mk_image
@@ -194,9 +191,9 @@
for theme in $(THEMES) ; do \
theme=$$theme image=$$theme/$$theme tmpdir=root-$$theme src=root
filelist=theme fs=squashfs bin/mk_image ; \
done
-ifneq ($(filter Zen, $(THEMES)),)
- libdeps=zenroot image=Zen/root tmpdir=zenroot src=root filelist=zenroot
fs=squashfs bin/mk_image
-endif
+
+zenroot:
+ theme=$(THEMES) libdeps=zenroot alternatives=1 image=zenroot src=root
fs=squashfs bin/mk_image
cd1: base
mkdir -p data/cd1/gen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/VERSION
new/installation-images-14.157/VERSION
--- old/installation-images-14.155/VERSION 2014-12-11 09:09:40.000000000
+0100
+++ new/installation-images-14.157/VERSION 2015-01-20 16:38:52.000000000
+0100
@@ -1 +1 @@
-14.155
+14.157
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/bin/mk_image
new/installation-images-14.157/bin/mk_image
--- old/installation-images-14.155/bin/mk_image 2014-12-11 09:09:40.000000000
+0100
+++ new/installation-images-14.157/bin/mk_image 2015-01-20 16:38:52.000000000
+0100
@@ -12,6 +12,7 @@
use Cwd "realpath";
sub check_link;
+sub fix_alternatives_link;
die "usage: $Script\n" if @ARGV;
@@ -95,6 +96,11 @@
SUSystem "strip_dir $tmpdir";
}
+ if($ENV{alternatives}) {
+ print "handling update-alternatives links...\n";
+ fix_alternatives_link $tmpdir;
+ }
+
if(!$ENV{nolinkcheck}) {
print "checking for dangling symlinks...\n";
if(check_link $tmpdir) {
@@ -205,3 +211,35 @@
return $err;
}
+
+sub fix_alternatives_link
+{
+ my $dir = shift;
+ my $cnt = 0;
+
+ die "oops, working on real root?\n" if $dir eq "" || $dir eq "/";
+
+ for (`find $dir -type l`) {
+ chomp;
+
+ my $x = readlink;
+ next if $x !~ m#/etc/alternatives/#;
+
+ my $l = readlink "$dir$x";
+ if($l) {
+ unlink $_;
+ if(!symlink($l, $_)) {
+ print STDERR "symlink $l, $_: $!\n"
+ }
+ $cnt++;
+ }
+ }
+
+ if($cnt) {
+ unlink "$dir/usr/sbin/update-alternatives";
+ unlink "$dir/var/log/update-alternatives.log";
+ system "rm -r $dir/etc/alternatives/";
+ system "rm -r $dir/var/lib/rpm/alternatives/";
+ }
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/changelog
new/installation-images-14.157/changelog
--- old/installation-images-14.155/changelog 2014-12-11 09:09:40.000000000
+0100
+++ new/installation-images-14.157/changelog 2015-01-20 16:38:52.000000000
+0100
@@ -1,4 +1,14 @@
-2014-12-11: 124e3172781dcf6e66a6d439aaf53e24fae43e24-14.155
+2015-01-20: 124e3172781dcf6e66a6d439aaf53e24fae43e24-14.157
+ - openldap2-client may require binutils
+
+2015-01-13: 14.156
+ - xterm/xterm-bin package split
+ - added function to handle update-alternatives
+ - started to make zenworks work again
+ - adjust to rubygem package naming mess
+ - adjust to factory changes
+
+2014-12-11: 14.155
- improve git2log to work with sub-branches
2014-12-10: 14.154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/data/root/bind.file_list
new/installation-images-14.157/data/root/bind.file_list
--- old/installation-images-14.155/data/root/bind.file_list 2014-12-11
09:09:40.000000000 +0100
+++ new/installation-images-14.157/data/root/bind.file_list 2015-01-20
16:38:52.000000000 +0100
@@ -1,8 +1,16 @@
+TEMPLATE binutils:
+ /
+ r /usr/bin/ld
+ s ld.bfd /usr/bin/ld
+
TEMPLATE:
/
bind-utils:
openldap2-client:
+
+yast2-buildtools: ignore
+
AUTODEPS:
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/data/root/gdb.file_list
new/installation-images-14.157/data/root/gdb.file_list
--- old/installation-images-14.155/data/root/gdb.file_list 2014-12-11
09:09:40.000000000 +0100
+++ new/installation-images-14.157/data/root/gdb.file_list 2015-01-20
16:38:52.000000000 +0100
@@ -3,6 +3,8 @@
gdb:
?valgrind:
+yast2-buildtools: ignore
+
AUTODEPS:
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/data/root/root.file_list
new/installation-images-14.157/data/root/root.file_list
--- old/installation-images-14.155/data/root/root.file_list 2014-12-11
09:09:40.000000000 +0100
+++ new/installation-images-14.157/data/root/root.file_list 2015-01-20
16:38:52.000000000 +0100
@@ -29,13 +29,22 @@
# avoid update-alternatives
e cd usr/sbin ; ln -snf SUSEConnect-* SUSEConnect
+# ruby maintainers can't really make up their minds on how to name their
packages...
+TEMPLATE ruby.*-rubygem-yard: ignore
+ # just a template that does nothing
+ d .
+
+TEMPLATE rubygem-yard: ignore
+ # just a template that does nothing
+ d .
+
TEMPLATE ruby.*-rubygem-.*:
/usr/*/ruby/gems/*/gems/*/lib
/usr/*/ruby/gems/*/specifications
-TEMPLATE ruby.*-rubygem-yard: ignore
- # just a template that does nothing
- d .
+TEMPLATE rubygem-.*:
+ /usr/*/ruby/gems/*/gems/*/lib
+ /usr/*/ruby/gems/*/specifications
TEMPLATE skelcd-control-.*:
# just a template that does nothing
@@ -453,10 +462,14 @@
xset:
xauth:
-xterm:
- /usr/share/X11/app-defaults/XTerm
- R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm
- /usr/bin/xterm
+if exists(xterm-bin)
+ xterm-bin:
+else
+ xterm:
+endif
+ /usr/share/X11/app-defaults/XTerm
+ R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm
+ /usr/bin/xterm
gpm:
/usr/sbin/gpm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.155/data/root/zenroot.file_list
new/installation-images-14.157/data/root/zenroot.file_list
--- old/installation-images-14.155/data/root/zenroot.file_list 2014-12-11
09:09:40.000000000 +0100
+++ new/installation-images-14.157/data/root/zenroot.file_list 2015-01-20
16:38:52.000000000 +0100
@@ -1,132 +1,119 @@
-
-#
-# the 'root' system
-#
-
-d bin dev etc lib mnt root sbin tmp usr var
+d run var
+d run/lock
+s ../run var
+d bin dev etc home lib mnt proc sys sbin tmp root
+d media/{cdrom,floppy}
c 1777 0 0 tmp
+d var/lib/systemd/migrated
# add some /etc files
x /etc/* /etc
-r /etc/ssh/CVS
-r /etc/CVS /etc/rpm/CVS /root/.ssh/CVS
+r /etc/ssh
+r /etc/rpm/.svn
r /etc/inst_setup
r /etc/inst_setup_ssh
r /etc/create_interface
-r /etc/motd
+r /etc/motd*
r /etc/issue
-libaudit*:
- /
-
-libsepol*:
- /
-
-libcap-ng*:
- /
-
-libparted*:
- /
-
-libffi*:
- /
-
-libgio-*-*:
- /
-
-libgmodule-*-*:
- /
-
-libmount*:
- /
-
-libudev*:
- /
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+# packages without scripts
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-fillup:
- /
-insserv-compat:
+TEMPLATE:
/
-aaa_base: prein,postin
-e prein
+# install filesystem first and *REMOVE* /var/run link
+filesystem:
+ /etc/{ppp,rc.d,uucp}
+ /etc/sysconfig
+ /root
+ /run
/etc/init.d
- /etc/inputrc
-e echo set bell-style none >>etc/inputrc
-# /etc/rc.status
- /usr/bin/old
-# /root/.gnupg/suse_build_key
-# /root/.gnupg/suse_build_key
- /var/adm/fillup-templates
-e postin
-r /var/adm/fillup-templates
-
-libpcre*:
- /
-
-tar:
- /bin/tar
-
-#samba
-libacl*:
- /lib*
-
-#samba
-libattr*:
- /lib*
-
-bash:
- /bin/bash
-s bash /bin/sh
-s bash /bin/ash
-
-libreadline6:
- /lib*/libreadline.so.*
- /lib*/libhistory.so.*
+ /usr/tmp
+ /var
+ # remove temporarily so that 'mount /sys' doesn't work
+ r /sys
+
+AUTODEPS:
+
+if theme eq 'SLES'
+ sles-release:
+ sles-release-MINI:
+elsif theme eq 'SLED'
+ sled-release:
+ sled-release-MINI:
+else
+ openSUSE-release:
+ openSUSE-release-mini:
+endif
+bzip2:
coreutils:
-
/bin/{chgrp,chmod,chown,cp,dd,df,ln,ls,mkdir,mknod,mv,rmdir,sync,md5sum,readlink}
- /usr/bin/du
- /bin/touch
- /bin/{date,echo,false,pwd,stty,true,uname,basename,mktemp}
- /usr/bin/{expr,tee,dirname,chroot,test,tty}
- /usr/bin/{cut,head,tail,tr,uniq,wc,od}
- /bin/sort
- /bin/kill
-
+cpio:
+device-mapper:
+diffutils:
+dmraid:
+dosfstools:
+e2fsprogs:
+file:
+fillup:
+findutils:
+grep:
gzip:
- bin/g{un,}zip
-
-joe:
- /usr/bin/joe
- /etc/joe/joerc
-
+hdparm:
+hex:
hwinfo:
- /usr/lib*
- /usr/sbin
-
-?libx86emu1:
- /
-
-libxml2-*:
- /
-
-libexpat*:
- /
-
-libglib-2_0-0:
- /
-
-libgobject-2_0-0:
- /
+initviocons:
+insserv-compat:
+iproute2:
+iputils:
+joe:
+klogd:
+kmod-compat:
+kmod:
+lilo:
+lvm2:
+ntfsprogs:
+parted:
+polkit:
+procps:
+reiserfs:
+suse-module-tools:
+systemd-presets-branding-<base_theme>:
+systemd-sysvinit:
+systemd:
+tar:
+unzip:
+usbutils:
+util-linux:
+udev: ignore
+libudev*:
+?ncpfs:
+pciutils:
+dos2unix:
+ftp:
+tftp:
+checkmedia:
+?grub2-i386-pc:
+?grub2-x86_64-efi:
+?grub2-arm64-efi:
+?grub2-powerpc-ieee1275:
+?grub2:
-udev:
+krb5:
/etc
- /sbin
+ /usr/lib*/libkrb5.so.*
+ /usr/lib*/libkrb5support.so.*
+ /usr/lib*/libgssapi_krb5.so.*
+ /usr/lib*/libk5crypto.so.*
-cifs-utils:
- /sbin/mount.cifs
+bash:
+ /bin/bash
+ s bash /bin/sh
dbus-1: prein
/
@@ -134,178 +121,19 @@
e prein
e restore_cfg etc/passwd etc/shadow etc/group
-dmraid:
- /sbin
- /lib*
-
-iputils:
- /bin/ping
-
-util-linux:
- /bin/dmesg
- /bin/logger
- /sbin/losetup
- /sbin/blockdev
- /sbin/fdisk
- /sbin/sfdisk
- /usr/sbin/setctsid
-
-libblkid*:
- /
-
-libuuid*:
- /
-
-libpolkit*:
- /
-
-polkit:
- /
-
-libselinux1:
- /
-
-libncurses5:
- /lib*/libncurses.so.5*
- /lib*/libncursesw.so.5*
-
ncurses-utils:
/usr/bin/reset
/usr/bin/tset
-libpopt*:
- /
-
-libwrap*:
- /
-
-libgcc_s*:
- /
-
-glibc:
- /sbin/ldconfig
- /lib*/ld*
- /lib*/lib{c,m}{.,-}*
- /lib*/{libcrypt,libdl,libnsl}{.,-}*
- /lib*/{libnss_compat,libnss_dns,libnss_files,libnss_hesiod}{.,-}*
- /lib*/{libnss_nis,libnss_nisplus,libresolv,librt,libutil}{.,-}*
- /usr/bin
- /etc/rpc
-r
/usr/bin/{catchsegv,gencat,getconf,getent,glibcbug,iconv,lddlibc4,mtrace,rpcgen,sprof}
-r /usr/sbin/{nscd,nscd_nischeck,utmpd}
- /lib*/libpthread{.,-}*
-
-hdparm:
- /sbin/hdparm
-
-
-e2fsprogs:
- /etc
- /sbin
- /usr/{,s}bin
-
-libext2fs2:
- /lib*
-
-libcom_err2:
- /lib*/libcom_err.so.*
- /lib*/libss.so.*
-
-libsmbios*:
- /
-
-libreiserfs-*-*:
- /
-
-file:
- /usr/bin/file
-
-libmagic*:
- /
-
-libmagic-data:
- m /usr/share/misc/magic /etc/magic
-
-lilo:
- /
-
-dosfstools:
- /sbin/{mkdosfs,mkfs.msdos,dosfsck,fsck.msdos}
-
net-tools:
/bin/{domain,host}name
/sbin/{ifconfig,route}
/sbin/plipconfig
-rpcbind: postin
- /etc
- /sbin
- /var/adm/fillup-templates
-E postin
-
-libtirpc1:
- /etc
- /lib*
-
-libgssglue1:
- /etc
- /lib*/libgssglue.so.*
-
-util-linux:
- /sbin/{mkfs,mkfs.minix,fsck.minix,mkswap,swapoff,swapon}
-
-libcap2:
- /lib*/libcap.so.*
-
-d /var/adm /var/tmp /var/lib/{amanda,gdm,news,pgsql,rpm,uucp/taylor_config}
-d /var/lock/subsys
-d /var/log/news /var/named /var/run
/var/spool/{atjobs,fax,fnet,lpd,mail,postfix,rwho,uucp}
-
-#d /var/X11R6/{bin,xkb/compiled,app-defaults}
-d /var/lib/xkb
-
-d /run/lock
-s ../lock /var/spool/locks
-
-t /var/log/{faillog,lastlog,mail,messages,sendmail.st,wtmp,xdm.errors}
-t /var/log/news/news.{crit,err,notice}
-
-c 1777 0 0 /var/tmp
-
-d /usr/{bin,lib,lib64,libexec,sbin,share}
-
-s ../var/spool /usr/spool
-s ../var/tmp /usr/tmp
-
-grep:
- /
-
-diffutils:
- /usr/bin/{cmp,diff}
-
-findutils:
- /
-
less:
/etc/lesskey
/usr/bin/less
-kmod:
- /
-
-kmod-compat:
- /
-
-suse-module-tools:
- /etc/modprobe.d
-
-libprocps*:
- /
-
-procps:
- /bin/ps
- /usr/bin/{free,top,vmstat}
-
psmisc:
m /bin/fuser /usr/bin
/usr/bin/killall
@@ -314,92 +142,31 @@
procinfo:
/usr/bin/socklist
-cpio:
- /
-
-c 0755 0 0 /usr/bin
-c 0755 0 0 /usr/lib*
-c 0755 0 0 /usr/sbin
-c 0755 0 0 /usr/share
-
x /etc/ld.so.conf /etc
-libz*:
- /
-
-c 0755 0 0 /usr
-
-libstdc++*:
- /
-
# remove these:
r root mnt tmp usr/libexec
netcfg:
/etc/{services,protocols}
-lvm2:
- /
-
-device-mapper:
- /lib*
- /sbin
-
-reiserfs:
- /sbin
-
-gawk:
- /bin
-# uses update-alternatives now
-s gawk bin/awk
-
-initviocons:
- /bin/initviocons
- /usr/bin/termprobes
-
-klogd:
- /sbin/klogd
-
-syslogd:
- m /sbin/syslogd /sbin/syslogd.bin
- x etc/syslogd /sbin/syslogd
-
- r /lib*/security/pam_userdb.so
+:
+ r /lib*/security/pam_userdb.so
- x etc/inst_setup_ssh /sbin/
- c 755 0 0 /sbin/inst_setup_ssh
- x etc/ssh /etc
- c 644 0 0 /etc/ssh/*
- d /root
- x root/.bash_history /root
- x root/.bash_login /root
- x root/.vimrc /root
+ x etc/inst_setup_ssh /sbin/
+ c 755 0 0 /sbin/inst_setup_ssh
+ s inst_setup_ssh /sbin/setup_ssh
+ # for Olaf
+ x etc/ssh /lib
+ x ../rescue/mount-rootfs-and-do-chroot.sh /bin
-parted:
- /
+openssl:
+ /usr/share/ssl
libopenssl*:
/lib*/libcrypto.so.*
/lib*/libssl.so.*
-hex:
- /
-
-bzip2:
- /
-
-libbz2-*:
- /
-
-unzip:
- /usr/bin/unzip
-
-iproute2:
- /sbin/ip
-
-ntfsprogs:
- /
-
dmidecode:
/usr/sbin/dmidecode
@@ -413,52 +180,97 @@
e echo MODIFY_RESOLV_CONF_DYNAMICALLY=\"yes\" >etc/sysconfig/network/config
# /sbin/modify_resolvconf
-pciutils:
- /
-
pciutils-ids:
m /usr/share/pci.ids.d/pci.ids.dist /usr/share/pci.ids
-usbutils:
+open-iscsi:
+ /sbin
+ /etc
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+# packages with scripts
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+# update-alternatives
+gawk:
/
+ E postin
-libusb-0_1-4:
+# update-alternatives
+unzip:
/
+ E postin
-libusb-1_0-0:
+aaa_base:
+ E prein
/
+ E postin
+ r /run/utmp
+ e echo set bell-style none >>etc/inputrc
-checkmedia:
- /usr/bin
+rpcbind:
+ /
+ E prein
+ E postin
-open-iscsi:
- /sbin
- /etc
+syslogd:
+ /
+ E prein
+ E postin
-dos2unix:
- /usr/bin/dos2unix
-?ncpfs:
- /
+:
-ftp:
- /usr/bin/ftp
+# remove files we don't want to show up at all
+r /usr/share/{doc,info,man} /usr/src/packages /var/adm/fillup-templates
-tftp:
- /usr/bin/tftp
+# remove /etc/os-release so it's not used accidentally
+r /etc/os-release
+
+# remove files we don't want to show up at all
+r /usr/share/{doc,info,man} /usr/src/packages /var/adm/fillup-templates
+r /etc/profile.d /etc/profile /etc/bash.bashrc /etc/bash_completion.d
+r /run /var/log/{cache,games,log,lock,mail,opt,spool} /var/run
+r /var/lib/systemd/migrated
+r /var/adm/autoinstall /var/lib/autoinstall
+r var/spool var/mail
+e rm -f `find var/log -type f`
+e rm -f `find var/cache -type f`
+
+# show remaining files in /var
+e find var -type f
+
+# they are all part of the initrd
+r /etc/passwd* /etc/shadow* /etc/group*
+
+# don't mess with mtab (from aaa_base postin ATM)
+r etc/mtab
+
+# remove these, we don't want them symlinked
+r root mnt tmp proc usr/libexec
x etc/inst_setup /sbin/inst_setup
-x etc/create_interface /sbin/create_interface
x etc/adddir /sbin/adddir
+x hostip_from_wicked /sbin/hostip_from_wicked
c 755 0 0 /sbin/inst_setup
-c 755 0 0 /sbin/create_interface
c 755 0 0 /sbin/adddir
+c 755 0 0 /sbin/hostip_from_wicked
+
+x /etc/ld.so.conf /etc
+# final clean up
+r /etc/X11/xserver/C
+r /sbin/insserv
-:
+# some scripts write to /dev/null...
+r /dev
-# remove, ehm, things...
-r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates
+# remove empty resolv.conf
+r /etc/resolv.conf
E TZ= LANG= LC_ALL= date +%Y%m%d >.timestamp
+# allowed dangling symlinks
+D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/etc/module.config
new/installation-images-14.157/etc/module.config
--- old/installation-images-14.155/etc/module.config 2014-12-11
09:09:40.000000000 +0100
+++ new/installation-images-14.157/etc/module.config 2015-01-20
16:38:52.000000000 +0100
@@ -146,6 +146,7 @@
ntb
ntb_netdev
nfsd
+grace
mlx4_en
inet_lro
@@ -259,6 +260,7 @@
[network]
MoreModules=net-modules
+bcm_sf2
dca,-,-
arcnet,"ARCnet","io=0x300"
bmac,"Apple bmac (PowerMacs with Mach64)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.155/install.i386
new/installation-images-14.157/install.i386
--- old/installation-images-14.155/install.i386 2014-12-11 09:09:40.000000000
+0100
+++ new/installation-images-14.157/install.i386 2015-01-20 16:38:52.000000000
+0100
@@ -83,3 +83,17 @@
cp data/boot/syslinux-rescue.cfg $dst/loader/isolinux.cfg
fi
+if [ -f images/zenroot ] ; then
+ t=openSUSE
+ [ -d $DESTDIR/branding/SLES ] && t=SLES
+ [ -d $DESTDIR/branding/SLED ] && t=SLED
+ dst=$DESTDIR/branding/Zen/CD1/boot/x86_64
+ mkdir -p $dst
+ cp images/zenroot $dst/root
+ echo "root: root" >$dst/config
+ cp -a $DESTDIR/CD1/boot/$ARCH/loader $DESTDIR/branding/$t/CD1/boot/$ARCH/*
$dst
+ cp -a $DESTDIR/branding/$t/CD1/EFI $DESTDIR/branding/Zen/CD1
+ cp data/boot/syslinux-zen.cfg $dst/loader/isolinux.cfg
+ cp data/boot/message-zen $dst/loader/message
+fi
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
