From 77b97e6c1e949f14fc644163eb47a75519ea52bd Mon Sep 17 00:00:00 2001 From: lace <> Date: Tue, 12 Sep 2006 19:14:37 +0000 Subject: [PATCH] Update. --- src/rawhide-bootstrap | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/rawhide-bootstrap b/src/rawhide-bootstrap index bbbd389..161d5c7 100755 --- a/src/rawhide-bootstrap +++ b/src/rawhide-bootstrap @@ -5,8 +5,9 @@ # http://cvs.jankratochvil.net/viewcvs/nethome/src/rawhide-bootstrap?rev=HEAD -###RPMS_URL_BASE=http://sunsite.mff.cuni.cz/pub/fedora/development/`uname -i`/os -RPMS_URL_BASE=http://localhost/redhat/devel/rawhide-latest/rawhide-latest/latest/`uname -i`/os +RPMS_URL_BASE=http://armstrong.rhts.boston.redhat.com/distros/rawhide-`uname -i` +wget -q -O - $RPMS_URL_BASE/GPL >/dev/null || \ +RPMS_URL_BASE=http://sunsite.mff.cuni.cz/pub/fedora/development/`uname -i`/os if test $# != 1;then echo >&2 "Syntax: $0 ";exit 1;fi @@ -15,6 +16,7 @@ if test "${ROOT#/}" = "$ROOT";then echo >&2 "Absolute pathname required: $ROOT"; cd / umount $ROOT/proc +umount $ROOT/selinux umount $ROOT/sys set -ex @@ -40,15 +42,18 @@ trap 'rm -f $KEY' EXIT mkdir $KEY cd $KEY # wget(1) due to: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=167483 +wget -q -O - `pkg fedora-release` >/dev/null wget -q -O - `pkg fedora-release` | rpm2cpio | cpio -id rm -rf $ROOT mkdir -p $ROOT/{etc,dev,var/log,sys} +cp -p /etc/resolv.conf $ROOT/etc awk '/^[ \t]*[^#]/ { if ($2 == "/" || $2 == "/sys" || $2 == "/proc") { print; }}' $ROOT/etc/fstab if grep -q '^LABEL=' $ROOT/etc/fstab;then awk <$ROOT/etc/fstab >$ROOT/etc/fstab2 '{ if ($2 == "/") $1="/dev/root"; }{ print; }' mv -f $ROOT/etc/fstab2 $ROOT/etc/fstab fi +echo 'none /selinux selinuxfs defaults 0 0' >>$ROOT/etc/fstab cp -a /dev/{null,urandom,random} `awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' <$ROOT/etc/fstab` $ROOT/dev/ touch $ROOT/{etc/mtab,var/log/lastlog} mount -tsysfs sysfs $ROOT/sys @@ -166,9 +171,17 @@ libusb gdbm mcstrans libcap +kpartx +fedora-release-notes EOH ` +mkdir -p $ROOT/var/lock/rpm +mkdir -p $ROOT/{proc,selinux} +mount -n -t proc none $ROOT/proc +mount -n -t selinuxfs none $ROOT/selinux $RPM --root=$ROOT -i * +umount $ROOT/proc +umount $ROOT/selinux rm -f * cd rm -rf $DOWNLOAD @@ -213,20 +226,6 @@ for repo in $ROOT/etc/yum.repos.d/*.repo;do done chroot $ROOT mount /proc -# Prevent: socket.error: (2, 'No such file or directory') -patch $ROOT/usr/lib/python2.4/site-packages/yum/logginglevels.py <