From 9a8bcf897aeabb74d3ae8fea4a7e872840b9f169 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 31 Oct 2010 14:44:49 +0000 Subject: [PATCH] add new profile.d script for portage rename git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2637 6952d904-891a-0410-993b-d76249ca496b --- Documentation/ls_pro_live/armv5tejl-stage4.spec | 6 +++--- Documentation/ls_pro_live/fsscript | 14 +++++++------- .../ls_pro_live/portage/package.mask/coreutils | 1 + .../root_overlay/etc/profile.d/go-portage.sh | 9 +++++++++ 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 Documentation/ls_pro_live/portage/package.mask/coreutils create mode 100644 Documentation/ls_pro_live/root_overlay/etc/profile.d/go-portage.sh diff --git a/Documentation/ls_pro_live/armv5tejl-stage4.spec b/Documentation/ls_pro_live/armv5tejl-stage4.spec index aa15a42..11a5df6 100644 --- a/Documentation/ls_pro_live/armv5tejl-stage4.spec +++ b/Documentation/ls_pro_live/armv5tejl-stage4.spec @@ -92,7 +92,7 @@ stage4/use: # then it will be defined elsewhere. # example: # stage4/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -stage4/packages: layman openssh dhcpcd udev micro_evtd expect linux-buffalo_ls_pro_live buffalo_ls_pro_live-sources gpm syslog-ng gdisk parted atop links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp +stage4/packages: layman openssh dhcpcd udev micro_evtd expect vixie-cron update-motd linux-buffalo_ls_pro_live buffalo_ls_pro_live-sources gpm syslog-ng gdisk parted atop links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp # A fsscript is simply a shell script that is copied into the chroot of the stage4 # after the kernel(s) and any external modules have been compiled and is @@ -149,7 +149,7 @@ stage4/modblacklist: # correctly for us. Since we do not use this, it is left blank below. # example: # stage4/rcadd: -stage4/rcadd: udev|sysinit micro_evtd-boot|boot hwclock|boot root|boot procfs|boot mtab|boot fsck|boot swap|boot micro_evtd|default syslog-ng|default net.eth0|default dbus|default linux-logo|default ntpd|default ntp-client|default smartd|default hddtemp|default sshd|default +stage4/rcadd: udev|sysinit micro_evtd-boot|boot hwclock|boot root|boot procfs|boot mtab|boot fsck|boot swap|boot vixie-cron|default micro_evtd|default syslog-ng|default net.eth0|default dbus|default linux-logo|default ntpd|default ntp-client|default smartd|default hddtemp|default sshd|default # This is for removing init script from runlevels. It is executed after the # defaults shipped with catalyst, so it is possible to remove the defaults using @@ -255,4 +255,4 @@ stage4/empty: /var/tmp/portage /var/tmp/ccache /var/tmp/binpkg /tmp # very usefu in cleaning up stray files in /etc left over after stage4/unmerge. # example: # stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf -stage4/rm: /usr/bin/qemu-arm +stage4/rm: /usr/bin/qemu-arm /root/move_portage diff --git a/Documentation/ls_pro_live/fsscript b/Documentation/ls_pro_live/fsscript index 3c0a1c2..d6822f3 100755 --- a/Documentation/ls_pro_live/fsscript +++ b/Documentation/ls_pro_live/fsscript @@ -23,19 +23,19 @@ rm -rf /usr/local/bin/.svn # but the linkstation works with it rm -f /etc/portage/package.mask/coreutils -# clean all not needed packages -emerge --depclean +# init bash profile for root +cp -Rv /etc/skel/.* /root/ -# unmount the snapshot for creationg the initial portage dir in the final package -umount /usr/portage +# create the new portage dir +mkdir /usr/portage.new # shrink the image by only syncing the requred dirs into /usr/portage # the only dirs that survive are profiles (required), eclass (required), licenses (required) # we have to use the IP as the resolve.conf file is already gone # but a new one will be added in a later phase of catylast -rsync -aPv rsync://83.164.133.198/gentoo-portage/profiles /usr/portage/ -rsync -aPv rsync://83.164.133.198/gentoo-portage/eclass /usr/portage/ -rsync -aPv rsync://83.164.133.198/gentoo-portage/licenses /usr/portage/ +rsync -aPv rsync://83.164.133.198/gentoo-portage/profiles /usr/portage.new/ +rsync -aPv rsync://83.164.133.198/gentoo-portage/eclass /usr/portage.new/ +rsync -aPv rsync://83.164.133.198/gentoo-portage/licenses /usr/portage.new/ # change password for root user /usr/local/bin/changepassword root goLsProLive diff --git a/Documentation/ls_pro_live/portage/package.mask/coreutils b/Documentation/ls_pro_live/portage/package.mask/coreutils new file mode 100644 index 0000000..310c9a1 --- /dev/null +++ b/Documentation/ls_pro_live/portage/package.mask/coreutils @@ -0,0 +1 @@ +=sys-apps/coreutils-8.6 diff --git a/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-portage.sh b/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-portage.sh new file mode 100644 index 0000000..f3c8596 --- /dev/null +++ b/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-portage.sh @@ -0,0 +1,9 @@ +if [ ! -f /root/move_portage ] +then + echo "delete old portage dir" + rm -rf /usr/portage + echo "rename new portage to old portage" + mv -f /usr/portage.new /usr/portage + echo "removing /etc/profile.d/go-portage.sh" + rm -f /etc/profile.d/go-portage.sh +fi