From: Andy Bavier Date: Mon, 10 Aug 2009 20:02:17 +0000 (+0000) Subject: Update to revision 2844 X-Git-Tag: util-vserver-0.30.216-pre2833-0~6 X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=616c79d7eee3bff076671ee8d475df2f2b640a16 Update to revision 2844 --- diff --git a/configure.ac b/configure.ac index f89b5ac..15ad14f 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ ENSC_PATHPROG(NOHUP, nohup) ENSC_PATHPROG(RMMOD, rmmod) ENSC_PATHPROG(VCONFIG, vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) ENSC_PATHPROG(WGET, wget) -ENSC_PATHPROG(IONICE, ionice,, [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) +ENSC_PATHPROG(IONICE, ionice, [], [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) ENSC_PATHPROG(FILE, file, [file]) ENSC_PATHPROG(GZIP, gzip, [gzip]) ENSC_PATHPROG(BZIP2, bzip2, [bzip2]) @@ -453,7 +453,7 @@ dnl ######################## dnl Check for Python ensc_have_python=yes -AM_PATH_PYTHON(,, [:]) +AM_PATH_PYTHON([2.4],, [:]) if test "x$PYTHON" = x:; then ensc_have_python=no fi diff --git a/distrib/Makefile.am b/distrib/Makefile.am index 8685fb0..0677896 100644 --- a/distrib/Makefile.am +++ b/distrib/Makefile.am @@ -51,27 +51,33 @@ nobase_distrib_DATA = defaults/devs \ fc2/apt/rpmpriorities fc2/pkgs/01 fc2/pkgs/02 \ fc3/apt/rpmpriorities fc3/pkgs/01 fc3/pkgs/02 fc3/pkgs/03 \ fc3/yum/yum.conf $(wildcard $(srcdir)/fc3/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/fc3/rpmlist.d/*.lst) $(wildcard $(srcdir)/c3/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/fc3/rpmlist.d/*.lst) $(wildcard $(srcdir)/fc3/rpmlist.d/*.opt) \ fc4/apt/rpmpriorities fc4/pkgs/01 fc4/pkgs/02 fc4/pkgs/03 \ fc4/yum/yum.conf $(wildcard $(srcdir)/fc4/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/fc4/rpmlist.d/*.lst) $(wildcard $(srcdir)/c4/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/fc4/rpmlist.d/*.lst) $(wildcard $(srcdir)/fc4/rpmlist.d/*.opt) \ fc5/apt/rpmpriorities fc5/pkgs/01 fc5/pkgs/02 fc5/pkgs/03 \ fc5/yum/yum.conf $(wildcard $(srcdir)/fc5/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/fc5/rpmlist.d/*.lst) $(wildcard $(srcdir)/c5/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/fc5/rpmlist.d/*.lst) $(wildcard $(srcdir)/fc5/rpmlist.d/*.opt) \ fc6/apt/rpmpriorities fc6/pkgs/01 fc6/pkgs/02 fc6/pkgs/03 \ fc6/yum/yum.conf $(wildcard $(srcdir)/fc6/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/fc6/rpmlist.d/*.lst) $(wildcard $(srcdir)/c6/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/fc6/rpmlist.d/*.lst) $(wildcard $(srcdir)/fc6/rpmlist.d/*.opt) \ f7/apt/rpmpriorities f7/pkgs/01 f7/pkgs/02 f7/pkgs/03 \ f7/yum/yum.conf $(wildcard $(srcdir)/f7/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/f7/rpmlist.d/*.lst) $(wildcard $(srcdir)/7/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/f7/rpmlist.d/*.lst) $(wildcard $(srcdir)/f7/rpmlist.d/*.opt) \ f8/apt/rpmpriorities f8/pkgs/01 f8/pkgs/02 f8/pkgs/03 \ f8/yum/yum.conf $(wildcard $(srcdir)/f8/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/f8/rpmlist.d/*.lst) $(wildcard $(srcdir)/8/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/f8/rpmlist.d/*.lst) $(wildcard $(srcdir)/f8/rpmlist.d/*.opt) \ $(wildcard $(srcdir)/f8/pubkeys/RPM-GPG*) \ f9/pkgs/01 f9/pkgs/02 f9/pkgs/03 f9/yum/yum.conf \ $(wildcard $(srcdir)/f9/yum.repos.d/*.repo) \ - $(wildcard $(srcdir)/f9/rpmlist.d/*.lst) $(wildcard $(srcdir)/9/rpmlist.d/*.opt) \ + $(wildcard $(srcdir)/f9/rpmlist.d/*.lst) $(wildcard $(srcdir)/f9/rpmlist.d/*.opt) \ $(wildcard $(srcdir)/f9/pubkeys/RPM-GPG*) \ + f10/pkgs/01 f10/pkgs/02 f10/pkgs/03 f10/yum/yum.conf \ + $(wildcard $(srcdir)/f10/yum.repos.d/*.repo) \ + $(wildcard $(srcdir)/f10/rpmlist.d/*.lst) $(wildcard $(srcdir)/f10/rpmlist.d/*.opt) \ + f11/pkgs/01 f11/pkgs/02 f11/pkgs/03 f11/yum/yum.conf \ + $(wildcard $(srcdir)/f11/yum.repos.d/*.repo) \ + $(wildcard $(srcdir)/f11/rpmlist.d/*.lst) $(wildcard $(srcdir)/f11/rpmlist.d/*.opt) \ centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \ centos4/yum/yum.conf $(wildcard $(srcdir)/centos4/yum.repos.d/*.repo) \ centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \ @@ -79,12 +85,7 @@ nobase_distrib_DATA = defaults/devs \ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ suse91/rpm/macros \ gentoo/init-vserver.sh gentoo/net.vserver \ - gentoo/reboot.sh gentoo/shutdown.sh \ - debian/debootstrap.script \ - breezy/debootstrap.script dapper/debootstrap.script \ - edgy/debootstrap.script feisty/debootstrap.script \ - gutsy/debootstrap.script hoary/debootstrap.script \ - warty/debootstrap.script + gentoo/reboot.sh gentoo/shutdown.sh nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ @@ -104,7 +105,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \ $(nobase_confdistrib_DATA) \ $(defaults_DATA) -redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 centos4 centos5 +redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 centos4 centos5 sid_style = etch lenny sid install-exec-hook: install-notify-xtra diff --git a/distrib/breezy/debootstrap.script b/distrib/breezy/debootstrap.script deleted file mode 100644 index 8b55993..0000000 --- a/distrib/breezy/debootstrap.script +++ /dev/null @@ -1,163 +0,0 @@ -default_mirror http://old-releases.ubuntu.com/ubuntu -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant -; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - # TODO: add Build-Essential: yes extraoverrides - #base="$(get_debs Build-Essential: yes)" - - add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; } - - base="apt binutils cpio cpp cpp-4.0 dpkg-dev g++ g++-4.0 gcc gcc-4.0 gcc-4.0-base ${LIBC6}-dev libdb4.2 libgdbm3 libstdc++6 libstdc++6-4.0-dev linux-kernel-headers make patch perl perl-modules" - - add ia64 base "libunwind7-dev" - add sparc base "lib64gcc1" - add sparc base "libc6-dev-sparc64" - add sparc base "libc6-sparc64" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - echo >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - setup_proc - in_target /sbin/ldconfig - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/dapper/debootstrap.script b/distrib/dapper/debootstrap.script deleted file mode 100644 index 63e8582..0000000 --- a/distrib/dapper/debootstrap.script +++ /dev/null @@ -1,170 +0,0 @@ -case $ARCH in - amd64|i386|powerpc|sparc) - default_mirror http://archive.ubuntu.com/ubuntu - ;; - *) - default_mirror http://ports.ubuntu.com/ubuntu-ports - ;; -esac -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant -; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - # TODO: add Build-Essential: yes extraoverrides - #base="$(get_debs Build-Essential: yes)" - - add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; } - - base="apt binutils cpio cpp cpp-4.0 dpkg-dev g++ g++-4.0 gcc gcc-4.0 ${LIBC6}-dev libgdbm3 libstdc++6 libstdc++6-4.0-dev linux-kernel-headers make patch perl perl-modules" - - add ia64 base "libunwind7-dev" - add sparc base "lib64gcc1" - add sparc base "libc6-dev-sparc64" - add sparc base "libc6-sparc64" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - : >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - setup_proc - in_target /sbin/ldconfig - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/debian/debootstrap.script b/distrib/debian/debootstrap.script deleted file mode 100644 index 480a74d..0000000 --- a/distrib/debian/debootstrap.script +++ /dev/null @@ -1,188 +0,0 @@ -case $ARCH in - amd64|i386) - ;; - *) - # ftp.debian.org only has amd64 and i386 - default_mirror http://ftp.us.debian.org/debian - ;; -esac -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd fakechroot - -if doing_variant fakechroot; then - test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started" -fi - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant - || doing_variant fakechroot; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - base="$(get_debs Build-Essential: yes)" - fi - - if doing_variant fakechroot; then - # ldd.fake needs binutils - required="$required binutils" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - echo >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - if [ -x $TARGET/usr/bin/md5sum.textutils -a \! -e $TARGET/usr/bin/md5sum ]; then - cp $TARGET/usr/bin/md5sum.textutils $TARGET/usr/bin/md5sum - fi - - if doing_variant fakechroot; then - setup_devices_fakechroot - else - setup_devices - fi - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - if doing_variant fakechroot; then - setup_proc_fakechroot - else - setup_proc - in_target /sbin/ldconfig - fi - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - if doing_variant fakechroot; then - install_fakechroot_tools - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - exec 7>&1 - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 \ - in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/edgy/debootstrap.script b/distrib/edgy/debootstrap.script deleted file mode 100644 index 7f656b6..0000000 --- a/distrib/edgy/debootstrap.script +++ /dev/null @@ -1,170 +0,0 @@ -case $ARCH in - amd64|i386|powerpc|sparc) - default_mirror http://archive.ubuntu.com/ubuntu - ;; - *) - default_mirror http://ports.ubuntu.com/ubuntu-ports - ;; -esac -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant -; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - # TODO: add Build-Essential: yes extraoverrides - #base="$(get_debs Build-Essential: yes)" - - add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; } - - base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules" - - add ia64 base "libunwind7-dev" - add sparc base "lib64gcc1" - add sparc base "libc6-dev-sparc64" - add sparc base "libc6-sparc64" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - : >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - setup_proc - in_target /sbin/ldconfig - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/f10/pkgs/01 b/distrib/f10/pkgs/01 new file mode 100644 index 0000000..1a5ef72 --- /dev/null +++ b/distrib/f10/pkgs/01 @@ -0,0 +1 @@ +glibc diff --git a/distrib/f10/pkgs/02 b/distrib/f10/pkgs/02 new file mode 100644 index 0000000..9ec5d2b --- /dev/null +++ b/distrib/f10/pkgs/02 @@ -0,0 +1,3 @@ +--reinstall + +filesystem diff --git a/distrib/f10/pkgs/03 b/distrib/f10/pkgs/03 new file mode 100644 index 0000000..218b1e6 --- /dev/null +++ b/distrib/f10/pkgs/03 @@ -0,0 +1,2 @@ +coreutils +initscripts diff --git a/distrib/f10/rpmlist.d/00.lst b/distrib/f10/rpmlist.d/00.lst new file mode 100644 index 0000000..d8db857 --- /dev/null +++ b/distrib/f10/rpmlist.d/00.lst @@ -0,0 +1,10 @@ +glibc-[0-9]*.rpm +basesystem-*.rpm +bash-[0-9]*.rpm +filesystem-*.rpm +glibc-common-*.rpm +libgcc-[0-9]*.rpm +ncurses-base-[0-9]*.rpm +ncurses-libs-*.rpm +setup-*.rpm +tzdata-*.rpm diff --git a/distrib/f10/yum.repos.d/fedora-updates-testing.repo b/distrib/f10/yum.repos.d/fedora-updates-testing.repo new file mode 100644 index 0000000..b471fb1 --- /dev/null +++ b/distrib/f10/yum.repos.d/fedora-updates-testing.repo @@ -0,0 +1,26 @@ +[updates-testing] +name=Fedora 10 - $basearch - Test Updates +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/10/$basearch/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch + +[updates-testing-debuginfo] +name=Fedora 10 - $basearch - Test Updates Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/10/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch + +[updates-testing-source] +name=Fedora 10 - Test Updates Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/10/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch diff --git a/distrib/f10/yum.repos.d/fedora-updates.repo b/distrib/f10/yum.repos.d/fedora-updates.repo new file mode 100644 index 0000000..6b15b7c --- /dev/null +++ b/distrib/f10/yum.repos.d/fedora-updates.repo @@ -0,0 +1,26 @@ +[updates] +name=Fedora 10 - $basearch - Updates +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/10/$basearch/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[updates-debuginfo] +name=Fedora 10 - $basearch - Updates - Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/10/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[updates-source] +name=Fedora 10 - Updates Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/10/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch diff --git a/distrib/f10/yum.repos.d/fedora.repo b/distrib/f10/yum.repos.d/fedora.repo new file mode 100644 index 0000000..a273aa3 --- /dev/null +++ b/distrib/f10/yum.repos.d/fedora.repo @@ -0,0 +1,26 @@ +[fedora] +name=Fedora 10 - $basearch +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/10/Everything/$basearch/os/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-$basearch + +[fedora-debuginfo] +name=Fedora 10 - $basearch - Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/10/Everything/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-$basearch + +[fedora-source] +name=Fedora 10 - Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/10/Everything/source/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-10&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/$basearch/os/RPM-GPG-KEY-$basearch diff --git a/distrib/f10/yum/yum.conf b/distrib/f10/yum/yum.conf new file mode 100644 index 0000000..cd0ccc9 --- /dev/null +++ b/distrib/f10/yum/yum.conf @@ -0,0 +1,11 @@ +[main] +cachedir=@YUMCACHEDIR@ +persistdir=@YUMLIBDIR@ +reposdir=@YUMETCDIR@/yum.repos.d +debuglevel=1 +logfile=@YUMLOGDIR@/log +lockfile=@YUMLOCKDIR@/yum.pid +pkgpolicy=newest +distroverpkg=fedora-release +installonlypkgs= +exactarch=0 diff --git a/distrib/f11/pkgs/01 b/distrib/f11/pkgs/01 new file mode 100644 index 0000000..1a5ef72 --- /dev/null +++ b/distrib/f11/pkgs/01 @@ -0,0 +1 @@ +glibc diff --git a/distrib/f11/pkgs/02 b/distrib/f11/pkgs/02 new file mode 100644 index 0000000..9ec5d2b --- /dev/null +++ b/distrib/f11/pkgs/02 @@ -0,0 +1,3 @@ +--reinstall + +filesystem diff --git a/distrib/f11/pkgs/03 b/distrib/f11/pkgs/03 new file mode 100644 index 0000000..218b1e6 --- /dev/null +++ b/distrib/f11/pkgs/03 @@ -0,0 +1,2 @@ +coreutils +initscripts diff --git a/distrib/f11/rpmlist.d/00.lst b/distrib/f11/rpmlist.d/00.lst new file mode 100644 index 0000000..c825733 --- /dev/null +++ b/distrib/f11/rpmlist.d/00.lst @@ -0,0 +1,11 @@ +glibc-[0-9]*.rpm +basesystem-*.rpm +bash-[0-9]*.rpm +filesystem-*.rpm +glibc-common-*.rpm +libgcc-[0-9]*.rpm +ncurses-base-[0-9]*.rpm +ncurses-libs-*.rpm +nss-softokn-freebl-*.rpm +setup-*.rpm +tzdata-*.rpm diff --git a/distrib/f11/yum.repos.d/fedora-updates-testing.repo b/distrib/f11/yum.repos.d/fedora-updates-testing.repo new file mode 100644 index 0000000..37fc490 --- /dev/null +++ b/distrib/f11/yum.repos.d/fedora-updates-testing.repo @@ -0,0 +1,26 @@ +[updates-testing] +name=Fedora 11 - $basearch - Test Updates +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/11/$basearch/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch + +[updates-testing-debuginfo] +name=Fedora 11 - $basearch - Test Updates Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/11/$basearch/debug/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch + +[updates-testing-source] +name=Fedora 11 - Test Updates Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/11/SRPMS/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch diff --git a/distrib/f11/yum.repos.d/fedora-updates.repo b/distrib/f11/yum.repos.d/fedora-updates.repo new file mode 100644 index 0000000..8bc086e --- /dev/null +++ b/distrib/f11/yum.repos.d/fedora-updates.repo @@ -0,0 +1,26 @@ +[updates] +name=Fedora 11 - $basearch - Updates +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/11/$basearch/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[updates-debuginfo] +name=Fedora 11 - $basearch - Updates - Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/11/$basearch/debug/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[updates-source] +name=Fedora 11 - Updates Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/11/SRPMS/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch diff --git a/distrib/f11/yum.repos.d/fedora.repo b/distrib/f11/yum.repos.d/fedora.repo new file mode 100644 index 0000000..8ee1736 --- /dev/null +++ b/distrib/f11/yum.repos.d/fedora.repo @@ -0,0 +1,26 @@ +[fedora] +name=Fedora 11 - $basearch +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Everything/$basearch/os/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[fedora-debuginfo] +name=Fedora 11 - $basearch - Debug +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Everything/$basearch/debug/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch + +[fedora-source] +name=Fedora 11 - Source +failovermethod=priority +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Everything/source/SRPMS/ +mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-11&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/$basearch/os/RPM-GPG-KEY-fedora-$basearch diff --git a/distrib/f11/yum/yum.conf b/distrib/f11/yum/yum.conf new file mode 100644 index 0000000..cd0ccc9 --- /dev/null +++ b/distrib/f11/yum/yum.conf @@ -0,0 +1,11 @@ +[main] +cachedir=@YUMCACHEDIR@ +persistdir=@YUMLIBDIR@ +reposdir=@YUMETCDIR@/yum.repos.d +debuglevel=1 +logfile=@YUMLOGDIR@/log +lockfile=@YUMLOCKDIR@/yum.pid +pkgpolicy=newest +distroverpkg=fedora-release +installonlypkgs= +exactarch=0 diff --git a/distrib/feisty/debootstrap.script b/distrib/feisty/debootstrap.script deleted file mode 100644 index 7f656b6..0000000 --- a/distrib/feisty/debootstrap.script +++ /dev/null @@ -1,170 +0,0 @@ -case $ARCH in - amd64|i386|powerpc|sparc) - default_mirror http://archive.ubuntu.com/ubuntu - ;; - *) - default_mirror http://ports.ubuntu.com/ubuntu-ports - ;; -esac -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant -; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - # TODO: add Build-Essential: yes extraoverrides - #base="$(get_debs Build-Essential: yes)" - - add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; } - - base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules" - - add ia64 base "libunwind7-dev" - add sparc base "lib64gcc1" - add sparc base "libc6-dev-sparc64" - add sparc base "libc6-sparc64" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - : >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - setup_proc - in_target /sbin/ldconfig - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/gutsy/debootstrap.script b/distrib/gutsy/debootstrap.script deleted file mode 100644 index 87d0f0e..0000000 --- a/distrib/gutsy/debootstrap.script +++ /dev/null @@ -1,171 +0,0 @@ -case $ARCH in - amd64|i386|sparc) - default_mirror http://archive.ubuntu.com/ubuntu - ;; - *) - default_mirror http://ports.ubuntu.com/ubuntu-ports - ;; -esac -mirror_style release -download_style apt -finddebs_style from-indices -variants - buildd - -work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi - - required="$(get_debs Priority: required)" - - if doing_variant -; then - #required="$required $(get_debs Priority: important)" - # ^^ should be getting debconf here somehow maybe - base="$(get_debs Priority: important)" - elif doing_variant buildd; then - # TODO: add Build-Essential: yes extraoverrides - #base="$(get_debs Build-Essential: yes)" - - add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; } - - base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules" - - add hppa base "libgcc4" - add ia64 base "libunwind7-dev" - add sparc base "lib64gcc1" - add sparc base "libc6-dev-sparc64" - add sparc base "libc6-sparc64" - fi -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - : >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - setup_proc - in_target /sbin/ldconfig - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - if doing_variant -; then - x_core_install debconf - fi - - baseprog=0 - bases=$(set -- $required; echo $#) - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | - (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ - dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - - smallyes '' | - (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ - dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} diff --git a/distrib/hoary/debootstrap.script b/distrib/hoary/debootstrap.script deleted file mode 100644 index 5450dc5..0000000 --- a/distrib/hoary/debootstrap.script +++ /dev/null @@ -1,179 +0,0 @@ -default_mirror http://old-releases.ubuntu.com/ubuntu -mirror_style release -download_style apt - -work_out_debs () { - - required="base-files base-passwd bash bsdutils coreutils libacl1 libattr1 debconf debconf-i18n liblocale-gettext-perl libtext-iconv-perl libtext-wrapi18n-perl libtext-charwidth-perl debianutils diff dpkg dselect libblkid1 e2fsprogs e2fslibs libcomerr2 libss2 libuuid1 findutils grep gzip hostname libcap1 libdb1-compat libdb3 libncurses5 libnewt0.51 libpam-modules libpam-runtime libpam0g libpopt0 login makedev mawk mount ncurses-base ncurses-bin passwd perl-base procps python-minimal python2.4-minimal sed slang1a-utf8 lsb-base initscripts sysvinit sysv-rc tar util-linux zlib1g whiptail libgcc1 gcc-3.3-base libstdc++5" - - base="adduser alsa-base alsa-utils apt apt-utils aptitude at base-config bind9-host bsdmainutils bzip2 console-common console-data console-tools cpio cramfsprogs cron dash dhcp3-client dhcp3-common discover1 discover1-data dmsetup dnsutils dosfstools ed eject ethtool evms evms-ncurses fdutils file ftp gettext-base gnupg grepmap groff-base hdparm hotplug ifrename ifupdown info initrd-tools iproute iptables iputils-arping iputils-ping iputils-tracepath jfsutils klogd less libasound2 libbz2-1.0 libconsole libdb4.2 libdevmapper1.00 libdiscover1 libdns16 libevms-2.5 libfribidi0 libgc1 libgcrypt11 libgdbm3 libgnutls11 libgpg-error0 libgpmg1 libidn11 libisc7 libiw27 libldap2 liblockfile1 liblwres1 liblzo1 libmagic1 libncursesw5 libopencdk8 libparted1.6-12 libpcap0.8 libreiserfs0.3-0 libsasl2 libsasl2-modules libsigc++-1.2-5c102 libssl0.9.7 libtasn1-2 libusb-0.1-4 libwrap0 locales logrotate lsb-release lshw lsof lvm-common lvm10 lvm2 mailx man-db manpages mdadm mii-diag mime-support module-init-tools mtr-tiny mutt nano net-tools netbase netcat netkit-inetd ntp ntpdate openssh-client parted pciutils popularity-contest postfix postfix-tls ppp pppconfig pppoeconf psmisc python python2.4 reiser4progs reiserfsprogs reportbug rsync strace sudo sysklogd tcpd tcpdump telnet time ubuntu-base ubuntu-keyring udev usbutils vim vim-common w3m wget wireless-tools xfsprogs" - - without_package () { - echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' ' - } - subst_package () { - echo "$3" | tr ' ' '\n' | sed "s/^$1$/$2/" | tr '\n' ' ' - } - - LIBC6=libc6 - - case $ARCH in - "i386") - required="$required libc6 libc6-i686" - base="$base dmidecode libelfg0 ltrace memtest86+ libreadline4" - ;; - "powerpc") - required="$required libc6 libreadline4" - base="$base hfsplus hfsutils libelfg0 libhfsp0 ltrace mac-fdisk pmac-fdisk powerpc-utils" - ;; - "amd64") - required="$required libc6" - base="$base dmidecode libelfg0 ltrace memtest86+ libreadline4" - ;; - "ia64") - required="$required libc6.1 libunwind7" - base="$base dmidecode libreadline4" - LIBC6="libc6.1" - ;; - "sparc") - required="$required libc6" - base="$base lib64gcc1 libc6-sparc64 libreadline4" - ;; - *) - # who knows? - ;; - esac -} - -install_debs () { - first_stage_install - second_stage_install -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - echo >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - baseprog=0 - bases=7 - - setup_proc - in_target /sbin/ldconfig - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - x_core_install debconf - - baseprog=0 - bases="$(set -- $required; echo $#)" - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - baseprog=0 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - #on_exit "(in_target_nofail umount /dev/pts) || true" - - smallyes '' | (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - baseprog=0 - - info CONFBASE "Configuring the base system..." - - mv "$TARGET/usr/sbin/sendmail" "$TARGET/usr/sbin/sendmail.REAL" - ln -s /bin/true "$TARGET/usr/sbin/sendmail" - - smallyes '' | (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - rm -f "$TARGET/usr/sbin/sendmail" - mv "$TARGET/usr/sbin/sendmail.REAL" "$TARGET/usr/sbin/sendmail" - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} - diff --git a/distrib/misc/debootstrap.uri b/distrib/misc/debootstrap.uri index 56aea56..2429699 100644 --- a/distrib/misc/debootstrap.uri +++ b/distrib/misc/debootstrap.uri @@ -1 +1 @@ -http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_all.deb +http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.15_all.deb diff --git a/distrib/warty/debootstrap.script b/distrib/warty/debootstrap.script deleted file mode 100644 index 8771d37..0000000 --- a/distrib/warty/debootstrap.script +++ /dev/null @@ -1,170 +0,0 @@ -default_mirror http://old-releases.ubuntu.com/ubuntu -mirror_style release -download_style apt - -work_out_debs () { - - required="base-files base-passwd bash bsdutils coreutils libacl1 libattr1 debconf debconf-i18n liblocale-gettext-perl libtext-iconv-perl libtext-wrapi18n-perl libtext-charwidth-perl debianutils diff dpkg dselect libblkid1 e2fsprogs e2fslibs libcomerr2 libss2 libuuid1 findutils grep gzip hostname libcap1 libc6 libdb1-compat libdb3 libncurses5 libnewt0.51 libpam-modules libpam-runtime libpam0g libpopt0 login makedev mawk modutils mount ncurses-base ncurses-bin passwd perl-base procps sed slang1a-utf8 lsb-base initscripts sysvinit sysv-rc tar util-linux zlib1g whiptail libgcc1 gcc-3.3-base libstdc++5" - - base="adduser alsa-base alsa-utils apt apt-utils aptitude at base-config bind9-host bsdmainutils bzip2 console-common console-data console-tools cpio cramfsprogs cron dash dbus-1 dhcp3-client dhcp3-common discover1 discover1-data dmsetup dnsutils dosfstools ed eject evms evms-ncurses fdutils file ftp gettext-base gnupg groff-base hdparm hotplug ifrename ifupdown info initrd-tools iproute iptables iputils-arping iputils-ping iputils-tracepath jfsutils klogd less libasound2 libatm1 libbz2-1.0 libconsole libdb4.2 libdevmapper1.00 libdiscover1 libdns16 libevms-2.3 libexpat1 libfribidi0 libgc1 libgcrypt7 libgdbm3 libgnutls10 libgpg-error0 libgpmg1 libidn11 libisc7 libiw27 libldap2 liblockfile1 liblwres1 liblzo1 libmagic1 libncursesw5 libopencdk8 libparted1.6-0 libpcap0.7 libpcap0.8 libreiserfs0.3-0 libsasl2 libsigc++-1.2-5c102 libssl0.9.7 libtasn1-2 libusb-0.1-4 libwrap0 locales logrotate lshw lsof ltrace lvm-common lvm10 lvm2 mailx man-db manpages mdadm mii-diag mime-support module-init-tools mtr-tiny mutt nano net-tools netbase netcat netkit-inetd ntp ntpdate openssh-client parted pciutils popularity-contest postfix postfix-tls ppp pppconfig pppoeconf psmisc python python2.3 reiser4progs reiserfsprogs reportbug rsync strace sudo sysklogd tcpd tcpdump telnet time ubuntu-base udev usbutils vim vim-common w3m wget wireless-tools xfsprogs" - - without_package () { - echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' ' - } - subst_package () { - echo "$3" | tr ' ' '\n' | sed "s/^$1$/$2/" | tr '\n' ' ' - } - - LIBC6=libc6 - - case $ARCH in - "i386") - required="$required libc6-i686" - base="$base dmidecode memtest86+ libreadline4" - ;; - "powerpc") - required="$required libreadline4" - base="$base hfsplus hfsutils libhfsp0 mac-fdisk pmac-fdisk powerpc-utils" - ;; - "amd64") - base="$base dmidecode libreadline4" - ;; - *) - # who knows? - ;; - esac -} - -install_debs () { - first_stage_install - second_stage_install -} - -first_stage_install () { - extract $required - - mkdir -p "$TARGET/var/lib/dpkg" - : >"$TARGET/var/lib/dpkg/status" - echo >"$TARGET/var/lib/dpkg/available" - - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" - chown 0.0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" - fi - - setup_devices - - x_feign_install () { - local pkg="$1" - local deb="$(debfor $pkg)" - local ver="$( - ar -p "$TARGET/$deb" control.tar.gz | zcat | - tar -O -xf - control ./control 2>/dev/null | - sed -ne 's/^Version: *//Ip' | head -n 1 - )" - - mkdir -p "$TARGET/var/lib/dpkg/info" - - echo \ -"Package: $pkg -Version: $ver -Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" - - touch "$TARGET/var/lib/dpkg/info/${pkg}.list" - } - - x_feign_install dpkg -} - -second_stage_install () { - x_core_install () { - smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") - } - - p () { - baseprog="$(($baseprog + ${1:-1}))" - } - - DEBIAN_FRONTEND=noninteractive - DEBCONF_NONINTERACTIVE_SEEN=true - export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - - setup_proc - in_target /sbin/ldconfig - - baseprog=0 - bases=7 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #1 - info INSTCORE "Installing core packages..." - - p; progress $baseprog $bases INSTCORE "Installing core packages" #2 - ln -sf mawk $TARGET/usr/bin/awk - x_core_install base-files base-passwd - p; progress $baseprog $bases INSTCORE "Installing core packages" #3 - x_core_install dpkg - - if [ ! -e "$TARGET/etc/localtime" ]; then - ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime" - fi - - p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 - - p; progress $baseprog $bases INSTCORE "Installing core packages" #5 - x_core_install perl-base - p; progress $baseprog $bases INSTCORE "Installing core packages" #6 - rm $TARGET/usr/bin/awk - x_core_install mawk - p; progress $baseprog $bases INSTCORE "Installing core packages" #7 - x_core_install debconf - - baseprog=0 - bases="$(set -- $required; echo $#)" - - info UNPACKREQ "Unpacking required packages..." - - smallyes '' | (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 - - baseprog=0 - - info CONFREQ "Configuring required packages..." - - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" - echo \ -"#!/bin/sh -echo -echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" - chmod 755 "$TARGET/sbin/start-stop-daemon" - - setup_dselect_method apt - #on_exit "(in_target_nofail umount /dev/pts) || true" - - smallyes '' | (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 - - baseprog=0 - bases="$(set -- $base; echo $#)" - - info UNPACKBASE "Unpacking the base system..." - - smallyes '' | (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 - - baseprog=0 - - info CONFBASE "Configuring the base system..." - - mv "$TARGET/usr/sbin/sendmail" "$TARGET/usr/sbin/sendmail.REAL" - ln -s /bin/true "$TARGET/usr/sbin/sendmail" - - smallyes '' | (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 - - rm -f "$TARGET/usr/sbin/sendmail" - mv "$TARGET/usr/sbin/sendmail.REAL" "$TARGET/usr/sbin/sendmail" - - mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" - - progress $bases $bases CONFBASE "Configuring base system" - info BASESUCCESS "Base system installed successfully." -} - diff --git a/scripts/vserver b/scripts/vserver index bcb936e..62405a6 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -166,12 +166,13 @@ test "$cmd" != build || { shift 2; exec $_VNAMESPACE --new -- \ allow_legacy= case "$vserver" in - (./*) VSERVER_DIR=`pwd`/$vserver;; - (/*) VSERVER_DIR=$vserver;; - (*) VSERVER_DIR=$__CONFDIR/$vserver + (./*) VSERVER_DIR="`pwd`/$vserver";; + (/*) VSERVER_DIR="$vserver";; + (*) VSERVER_DIR="$__CONFDIR/$vserver" allow_legacy=1 ;; esac +VSERVER_DIR="${VSERVER_DIR%%/}" if test -n "$allow_legacy"; then do_legacy= diff --git a/scripts/vserver.functions b/scripts/vserver.functions index a1cb49a..90a4c1f 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -147,6 +147,8 @@ function _generateIONiceCommand local ionice_class=2 local ionice_priority=0 + test -n "$_IONICE" || return 0 + test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority diff --git a/src/exec-remount.c b/src/exec-remount.c index d54683b..4749785 100644 --- a/src/exec-remount.c +++ b/src/exec-remount.c @@ -40,6 +40,10 @@ #define CMD_VERSION 0x1001 #define CMD_MTAB 0x2001 +#ifndef MNT_DETACH +#define MNT_DETACH 0x0002 +#endif + static struct option const CMDLINE_OPTIONS[] = { { "help", no_argument, 0, CMD_HELP }, diff --git a/src/secure-mount.c b/src/secure-mount.c index ce9e573..3abc672 100644 --- a/src/secure-mount.c +++ b/src/secure-mount.c @@ -112,7 +112,19 @@ CMDLINE_OPTIONS[] = { }; #ifndef MS_REC -# define MS_REC 0x4000 +#define MS_REC 0x4000 +#endif +#ifndef MS_UNBINDABLE +#define MS_UNBINDABLE (1<<17) +#endif +#ifndef MS_PRIVATE +#define MS_PRIVATE (1<<18) +#endif +#ifndef MS_SLAVE +#define MS_SLAVE (1<<19) +#endif +#ifndef MS_SHARED +#define MS_SHARED (1<<20) #endif static struct FstabOption { diff --git a/src/vcontext.c b/src/vcontext.c index 8e68231..1e92f84 100644 --- a/src/vcontext.c +++ b/src/vcontext.c @@ -71,6 +71,11 @@ #define CMD_PIVOT_ROOT 0x4011 +#ifndef MNT_DETACH +#define MNT_DETACH 0x0002 +#endif + + struct option const CMDLINE_OPTIONS[] = { { "help", no_argument, 0, CMD_HELP }, diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 85d5e46..30d9929 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -9,6 +9,7 @@ ## --with xalan ... require/use the xalan xslt processor ## --without doc ... disable doc generation ## --with legacy ... enable the legacy APIs +## --without python ... disable the Python bindings %global confdir %_sysconfdir/vservers %global confdefaultdir %confdir/.defaults @@ -22,6 +23,18 @@ %global subver %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} ) +# Mandriva does funky stuff that break us. +%if %{?mandriva_release:1}%{!?mandriva_release:0} +%global mandriva 1 +%global _disable_libtoolize 1 +%global _disable_ld_as_needed 1 +%global _disable_ld_no_undefined 1 +%global before_configure \ + %setup_compile_flags \ + CONFIGURE_TOP="${CONFIGURE_TOP:-.}" +%endif + + %{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities @@ -40,7 +53,7 @@ Requires: %name-lib = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version -BuildRequires: mount vconfig gawk iproute iptables +BuildRequires: mount vconfig gawk /sbin/ip iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel e2fsprogs %{!?_without_beecrypt:BuildRequires: beecrypt-devel}