git://git.onelab.eu
/
bootcd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f575445
)
modified to use common functions from build/build.common
modular_build
modular_build
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Thu, 30 Aug 2007 16:39:09 +0000
(16:39 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Thu, 30 Aug 2007 16:39:09 +0000
(16:39 +0000)
prep.sh
patch
|
blob
|
history
diff --git
a/prep.sh
b/prep.sh
index
883e10f
..
1880986
100755
(executable)
--- a/
prep.sh
+++ b/
prep.sh
@@
-8,7
+8,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
-# $Id: prep.sh,v 1.1
2 2006/08/21 20:24:09
mlhuang Exp $
+# $Id: prep.sh,v 1.1
3 2006/08/21 20:45:23
mlhuang Exp $
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@
-26,9
+26,7
@@
fi
export PATH
export PATH
-# Release and architecture to install
-releasever=4
-basearch=i386
+. build.common
# Packages to install
packagelist=(
# Packages to install
packagelist=(
@@
-109,30
+107,6
@@
usr/share/zoneinfo/UTC
usr/lib/locale/en_US.utf8
)
usr/lib/locale/en_US.utf8
)
-usage()
-{
- echo "Usage: prep.sh [OPTION]..."
- echo " -r release Fedora release number (default: $releasever)"
- echo " -a arch Fedora architecture (default: $basearch)"
- echo " -h This message"
- exit 1
-}
-
-# Get options
-while getopts "r:a:h" opt ; do
- case $opt in
- r)
- releasever=$OPTARG
- ;;
- a)
- basearch=$OPTARG
- ;;
- h|*)
- usage
- ;;
- esac
-done
-
# Do not tolerate errors
set -e
# Do not tolerate errors
set -e
@@
-147,7
+121,8
@@
rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 >build/ve
for package in "${packagelist[@]}" ; do
packages="$packages -p $package"
done
for package in "${packagelist[@]}" ; do
packages="$packages -p $package"
done
-mkfedora -v -r $releasever -a $basearch -k $packages $bootcd
+
+pl_setup_chroot $bootcd $packages
pushd $bootcd
pushd $bootcd
@@
-165,9
+140,6
@@
rm -f precious.tar
popd
popd
-# Disable all services in reference image
-chroot $bootcd sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
-
# Install ipnmac (for SuperMicro machines with IPMI)
echo "* Installing IPMI utilities"
install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
# Install ipnmac (for SuperMicro machines with IPMI)
echo "* Installing IPMI utilities"
install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac