Attachment 2613 Details for Bug 15637 – mkimage example profile quick-n-dirty not-fixing patch

[patch] mkimage example profile quick-n-dirty not-fixing patch

example1-underfixed.diff (text/plain), 11.15 KB, created by Michael Shigorin on 2008-05-13 14:51:21 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2008-05-13 14:51:21 MSD

Size: 11.15 KB

patch

obsolete

>diff -Naur example1-orig/base/packages example1/base/packages
>--- example1-orig/base/packages	2008-03-14 17:23:49 +0200
>+++ example1/base/packages	2008-05-13 12:41:38 +0300
>@@ -7,9 +7,9 @@
> interactivesystem
> kbd
> kernel-image-ovz-smp
>-kernel-modules-atl1-std-smp
>+#kernel-modules-atl1-std-smp
> kernel-image-std-smp
>-kernel-modules-atl1-ovz-smp
>+#kernel-modules-atl1-ovz-smp
> lilo
> setarch
> shadow-suite
>@@ -20,7 +20,7 @@
> vim-console
> 
> # network tools
>-elinks-utf8-hack
>+#elinks-utf8-hack
> hostinfo
> iptables
> iputils
>@@ -61,4 +61,5 @@
> ve-base
> 
> # alterator
>-alterator-install3-server
>+#alterator-install3-server
>+installer-server-stage3
>diff -Naur example1-orig/disk/packages example1/disk/packages
>--- example1-orig/disk/packages	2008-03-14 17:23:49 +0200
>+++ example1/disk/packages	2008-05-13 12:45:09 +0300
>@@ -298,14 +298,14 @@
> look
> lua5
> lua5-doc
>-nfs-clients
>-nfs-server
>+#nfs-clients
>+#nfs-server
> openssh-askpass-common
> openssl-doc
> pam0_timestamp
> pam-doc
> pam_userpass-devel
>-pciutils-devel-static
>+#pciutils-devel-static
> perl-full
> python-dev
> setproctitle-devel
>@@ -426,7 +426,8 @@
> dstat
> enca
> mod_limitipconn
>-mod_ssl mod_ssl-doc
>+mod_ssl
>+#mod_ssl-doc
> monit
> webalizer
> wget
>diff -Naur example1-orig/install2/image-scripts.d/999-system example1/install2/image-scripts.d/999-system
>--- example1-orig/install2/image-scripts.d/999-system	1970-01-01 03:00:00 +0300
>+++ example1/install2/image-scripts.d/999-system	2008-05-13 13:14:50 +0300
>@@ -0,0 +1,144 @@
>+#!/bin/sh -ex
>+
>+cd "$WORKDIR"
>+
>+# stage1 need this
>+mkdir -p ./image
>+
>+# setup stage2 as init
>+mv -f ./usr/sbin/install2-init ./sbin/init
>+
>+# udev needed this
>+ln -s /proc/mounts /etc/mtab
>+
>+# remove all docs
>+rm -rf ./usr/share/{doc,man,info,license,gfxboot}
>+
>+# remove icons
>+rm -rf ./usr/share/icons/{hicolor,large,mini}
>+
>+# remove PAM plugins
>+rm -rf ./lib*/security
>+
>+# remove cpp
>+fakechroot "$WORKDIR/" rpmquery -a cpp\* gcc\* |
>+	xargs -r fakechroot "$WORKDIR/" rpmi -e --nodeps --
>+
>+# remove X11 dri modules
>+rm -rf ./usr/lib*/X11/modules/dri
>+rm -rf ./usr/lib*/X11/modules/multimedia
>+rm -rf ./usr/lib*/X11/mesa_gl
>+
>+rm -f ./usr/lib*/X11/modules/extensions/libglx.so
>+rm -f ./usr/lib*/X11/modules/extensions/libdri.so
>+rm -f ./usr/lib*/X11/modules/extensions/libGLcore.so
>+
>+# remove unneeded kernel modules
>+rm -rf ./lib/modules/*/kernel/arch
>+rm -rf ./lib/modules/*/kernel/crypto
>+rm -rf ./lib/modules/*/kernel/drivers/atm
>+rm -rf ./lib/modules/*/kernel/drivers/char/watchdog
>+rm -rf ./lib/modules/*/kernel/drivers/cpufreq
>+rm -rf ./lib/modules/*/kernel/drivers/edac
>+rm -rf ./lib/modules/*/kernel/drivers/firmware
>+rm -rf ./lib/modules/*/kernel/drivers/hwmon
>+rm -rf ./lib/modules/*/kernel/drivers/infiniband
>+rm -rf ./lib/modules/*/kernel/drivers/input/{gameport,joy*}
>+rm -rf ./lib/modules/*/kernel/drivers/isdn
>+rm -rf ./lib/modules/*/kernel/drivers/media
>+rm -rf ./lib/modules/*/kernel/drivers/mmc
>+rm -rf ./lib/modules/*/kernel/drivers/mtd*
>+rm -rf ./lib/modules/*/kernel/drivers/net/irda
>+rm -rf ./lib/modules/*/kernel/drivers/rtc
>+rm -rf ./lib/modules/*/kernel/drivers/spi
>+rm -rf ./lib/modules/*/kernel/drivers/telephony
>+rm -rf ./lib/modules/*/kernel/drivers/usb/{misc,mon}
>+rm -rf ./lib/modules/*/kernel/drivers/video
>+rm -rf ./lib/modules/*/kernel/drivers/w1
>+rm -rf ./lib/modules/*/kernel/fs/quota*
>+rm -rf ./lib/modules/*/kernel/fs/9p
>+rm -rf ./lib/modules/*/kernel/fs/adfs
>+rm -rf ./lib/modules/*/kernel/fs/affs
>+rm -rf ./lib/modules/*/kernel/fs/afs
>+rm -rf ./lib/modules/*/kernel/fs/autofs
>+rm -rf ./lib/modules/*/kernel/fs/autofs4
>+rm -rf ./lib/modules/*/kernel/fs/befs
>+rm -rf ./lib/modules/*/kernel/fs/bfs
>+rm -rf ./lib/modules/*/kernel/fs/cifs
>+rm -rf ./lib/modules/*/kernel/fs/coda
>+rm -rf ./lib/modules/*/kernel/fs/configfs
>+rm -rf ./lib/modules/*/kernel/fs/cramfs
>+rm -rf ./lib/modules/*/kernel/fs/efs
>+rm -rf ./lib/modules/*/kernel/fs/exportfs
>+rm -rf ./lib/modules/*/kernel/fs/freevxfs
>+rm -rf ./lib/modules/*/kernel/fs/fuse
>+rm -rf ./lib/modules/*/kernel/fs/hfs
>+rm -rf ./lib/modules/*/kernel/fs/hfsplus
>+rm -rf ./lib/modules/*/kernel/fs/hpfs
>+rm -rf ./lib/modules/*/kernel/fs/jffs
>+rm -rf ./lib/modules/*/kernel/fs/jffs2
>+rm -rf ./lib/modules/*/kernel/fs/lockd
>+rm -rf ./lib/modules/*/kernel/fs/minix
>+rm -rf ./lib/modules/*/kernel/fs/ncpfs
>+rm -rf ./lib/modules/*/kernel/fs/ocfs2
>+rm -rf ./lib/modules/*/kernel/fs/qnx4
>+rm -rf ./lib/modules/*/kernel/fs/smbfs
>+rm -rf ./lib/modules/*/kernel/fs/sysv
>+rm -rf ./lib/modules/*/kernel/fs/udf
>+rm -rf ./lib/modules/*/kernel/fs/ufs
>+rm -rf ./lib/modules/*/kernel/net/*/netfilter
>+rm -rf ./lib/modules/*/kernel/net/appletalk
>+rm -rf ./lib/modules/*/kernel/net/ax25
>+rm -rf ./lib/modules/*/kernel/net/bluetooth
>+rm -rf ./lib/modules/*/kernel/net/bridge
>+rm -rf ./lib/modules/*/kernel/net/dccp
>+rm -rf ./lib/modules/*/kernel/net/decnet
>+rm -rf ./lib/modules/*/kernel/net/econet
>+rm -rf ./lib/modules/*/kernel/net/ipv6
>+rm -rf ./lib/modules/*/kernel/net/ipx
>+rm -rf ./lib/modules/*/kernel/net/irda
>+rm -rf ./lib/modules/*/kernel/net/netfilter
>+rm -rf ./lib/modules/*/kernel/net/netrom
>+rm -rf ./lib/modules/*/kernel/net/rose
>+rm -rf ./lib/modules/*/kernel/net/sctp
>+rm -rf ./lib/modules/*/kernel/net/tipc
>+rm -rf ./lib/modules/*/kernel/net/x25
>+rm -rf ./lib/modules/*/kernel/sound
>+
>+# remove blacklisted kernel modules
>+sed -n 's/^blacklist[[:space:]]\+$[^[:space:]]\+$.*/\1/p' ./etc/modprobe.d/* |
>+	while read i; do
>+		/.host/find ./lib/modules/ -type f -name "$i.ko" -delete
>+	done
>+
>+# remove rpm db
>+rm -rf ./var/lib/rpm/*
>+
>+# remove apt data files
>+rm -rf ./var/cache/apt ./var/lib*/apt
>+
>+# remove unneeded translations
>+/.host/find ./usr/share/locale/ -type f \! -name 'alterator*' -delete
>+
>+# remove non-utf8 locales
>+/.host/find ./usr/lib*/locale -mindepth 1 -maxdepth 1 -type d \! -name '*.utf8' -print0 |
>+	xargs -r0 rm -rf --
>+
>+# run depmod
>+if [ -x /usr/bin/fakechroot ]; then
>+	cat > .script.sh <<-EOF
>+	#!/bin/sh -x
>+	for i in /lib*/modules/*; do
>+		/sbin/depmod -a -F /boot/System.map-\${i##*/} \${i##*/}
>+	done
>+	EOF
>+	chmod +x .script.sh
>+	fakechroot /sbin/chroot "$WORKDIR/" /.script.sh
>+	rm -f .script.sh
>+fi
>+
>+# remove ogfs
>+rm -f ./lib*/evms/*/ogfs*
>+
>+# remove kernel images
>+rm -rf ./boot/*
>diff -Naur example1-orig/install2/packages example1/install2/packages
>--- example1-orig/install2/packages	2008-03-14 17:23:49 +0200
>+++ example1/install2/packages	2008-05-13 12:40:14 +0300
>@@ -19,4 +19,5 @@
> netcat
> iproute2
> 
>-alterator-install2-server
>+#alterator-install2-server
>+installer-server-stage2
>diff -Naur example1-orig/install2/scripts.d/999-system example1/install2/scripts.d/999-system
>--- example1-orig/install2/scripts.d/999-system	2008-03-14 17:23:49 +0200
>+++ example1/install2/scripts.d/999-system	1970-01-01 03:00:00 +0300
>@@ -1,141 +0,0 @@
>-#!/bin/sh -ex
>-
>-cd "$WORKDIR"
>-
>-# stage1 need this
>-mkdir -p ./image
>-
>-# setup stage2 as init
>-mv -f ./usr/sbin/install2-init ./sbin/init
>-
>-# remove all docs
>-rm -rf ./usr/share/{doc,man,info,license,gfxboot}
>-
>-# remove icons
>-rm -rf ./usr/share/icons/{hicolor,large,mini}
>-
>-# remove PAM plugins
>-rm -rf ./lib*/security
>-
>-# remove cpp
>-fakechroot "$WORKDIR/" rpmquery -a cpp\* gcc\* |
>-	xargs -r fakechroot "$WORKDIR/" rpmi -e --nodeps --
>-
>-# remove X11 dri modules
>-rm -rf ./usr/lib*/X11/modules/dri
>-rm -rf ./usr/lib*/X11/modules/multimedia
>-rm -rf ./usr/lib*/X11/mesa_gl
>-
>-rm -f ./usr/lib*/X11/modules/extensions/libglx.so
>-rm -f ./usr/lib*/X11/modules/extensions/libdri.so
>-rm -f ./usr/lib*/X11/modules/extensions/libGLcore.so
>-
>-# remove unneeded kernel modules
>-rm -rf ./lib/modules/*/kernel/arch
>-rm -rf ./lib/modules/*/kernel/crypto
>-rm -rf ./lib/modules/*/kernel/drivers/atm
>-rm -rf ./lib/modules/*/kernel/drivers/char/watchdog
>-rm -rf ./lib/modules/*/kernel/drivers/cpufreq
>-rm -rf ./lib/modules/*/kernel/drivers/edac
>-rm -rf ./lib/modules/*/kernel/drivers/firmware
>-rm -rf ./lib/modules/*/kernel/drivers/hwmon
>-rm -rf ./lib/modules/*/kernel/drivers/infiniband
>-rm -rf ./lib/modules/*/kernel/drivers/input/{gameport,joy*}
>-rm -rf ./lib/modules/*/kernel/drivers/isdn
>-rm -rf ./lib/modules/*/kernel/drivers/media
>-rm -rf ./lib/modules/*/kernel/drivers/mmc
>-rm -rf ./lib/modules/*/kernel/drivers/mtd*
>-rm -rf ./lib/modules/*/kernel/drivers/net/irda
>-rm -rf ./lib/modules/*/kernel/drivers/rtc
>-rm -rf ./lib/modules/*/kernel/drivers/spi
>-rm -rf ./lib/modules/*/kernel/drivers/telephony
>-rm -rf ./lib/modules/*/kernel/drivers/usb/{misc,mon}
>-rm -rf ./lib/modules/*/kernel/drivers/video
>-rm -rf ./lib/modules/*/kernel/drivers/w1
>-rm -rf ./lib/modules/*/kernel/fs/quota*
>-rm -rf ./lib/modules/*/kernel/fs/9p
>-rm -rf ./lib/modules/*/kernel/fs/adfs
>-rm -rf ./lib/modules/*/kernel/fs/affs
>-rm -rf ./lib/modules/*/kernel/fs/afs
>-rm -rf ./lib/modules/*/kernel/fs/autofs
>-rm -rf ./lib/modules/*/kernel/fs/autofs4
>-rm -rf ./lib/modules/*/kernel/fs/befs
>-rm -rf ./lib/modules/*/kernel/fs/bfs
>-rm -rf ./lib/modules/*/kernel/fs/cifs
>-rm -rf ./lib/modules/*/kernel/fs/coda
>-rm -rf ./lib/modules/*/kernel/fs/configfs
>-rm -rf ./lib/modules/*/kernel/fs/cramfs
>-rm -rf ./lib/modules/*/kernel/fs/efs
>-rm -rf ./lib/modules/*/kernel/fs/exportfs
>-rm -rf ./lib/modules/*/kernel/fs/freevxfs
>-rm -rf ./lib/modules/*/kernel/fs/fuse
>-rm -rf ./lib/modules/*/kernel/fs/hfs
>-rm -rf ./lib/modules/*/kernel/fs/hfsplus
>-rm -rf ./lib/modules/*/kernel/fs/hpfs
>-rm -rf ./lib/modules/*/kernel/fs/jffs
>-rm -rf ./lib/modules/*/kernel/fs/jffs2
>-rm -rf ./lib/modules/*/kernel/fs/lockd
>-rm -rf ./lib/modules/*/kernel/fs/minix
>-rm -rf ./lib/modules/*/kernel/fs/ncpfs
>-rm -rf ./lib/modules/*/kernel/fs/ocfs2
>-rm -rf ./lib/modules/*/kernel/fs/qnx4
>-rm -rf ./lib/modules/*/kernel/fs/smbfs
>-rm -rf ./lib/modules/*/kernel/fs/sysv
>-rm -rf ./lib/modules/*/kernel/fs/udf
>-rm -rf ./lib/modules/*/kernel/fs/ufs
>-rm -rf ./lib/modules/*/kernel/net/*/netfilter
>-rm -rf ./lib/modules/*/kernel/net/appletalk
>-rm -rf ./lib/modules/*/kernel/net/ax25
>-rm -rf ./lib/modules/*/kernel/net/bluetooth
>-rm -rf ./lib/modules/*/kernel/net/bridge
>-rm -rf ./lib/modules/*/kernel/net/dccp
>-rm -rf ./lib/modules/*/kernel/net/decnet
>-rm -rf ./lib/modules/*/kernel/net/econet
>-rm -rf ./lib/modules/*/kernel/net/ipv6
>-rm -rf ./lib/modules/*/kernel/net/ipx
>-rm -rf ./lib/modules/*/kernel/net/irda
>-rm -rf ./lib/modules/*/kernel/net/netfilter
>-rm -rf ./lib/modules/*/kernel/net/netrom
>-rm -rf ./lib/modules/*/kernel/net/rose
>-rm -rf ./lib/modules/*/kernel/net/sctp
>-rm -rf ./lib/modules/*/kernel/net/tipc
>-rm -rf ./lib/modules/*/kernel/net/x25
>-rm -rf ./lib/modules/*/kernel/sound
>-
>-# remove blacklisted kernel modules
>-sed -n 's/^blacklist[[:space:]]\+$[^[:space:]]\+$.*/\1/p' ./etc/modprobe.d/* |
>-	while read i; do
>-		/.host/find ./lib/modules/ -type f -name "$i.ko" -delete
>-	done
>-
>-# remove rpm db
>-rm -rf ./var/lib/rpm/*
>-
>-# remove apt data files
>-rm -rf ./var/cache/apt ./var/lib*/apt
>-
>-# remove unneeded translations
>-/.host/find ./usr/share/locale/ -type f \! -name 'alterator*' -delete
>-
>-# remove non-utf8 locales
>-/.host/find ./usr/lib*/locale -mindepth 1 -maxdepth 1 -type d \! -name '*.utf8' -print0 |
>-	xargs -r0 rm -rf --
>-
>-# run depmod
>-if [ -x /usr/bin/fakechroot ]; then
>-	cat > .script.sh <<-EOF
>-	#!/bin/sh -x
>-	for i in /lib*/modules/*; do
>-		/sbin/depmod -a -F /boot/System.map-\${i##*/} \${i##*/}
>-	done
>-	EOF
>-	chmod +x .script.sh
>-	fakechroot /sbin/chroot "$WORKDIR/" /.script.sh
>-	rm -f .script.sh
>-fi
>-
>-# remove ogfs
>-rm -f ./lib*/evms/*/ogfs*
>-
>-# remove kernel images
>-rm -rf ./boot/*

Actions: View | Diff

Attachments on bug 15637: 2613