diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-01-12 16:40:11 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-01-12 16:40:11 +0300 |
| commit | 75f38d0792862e2896d1adf27528e70751a301f2 (patch) | |
| tree | 6194bf757fc50a53365dabea5cdcd9ae3eb76c2b | |
| parent | 7ea7a056b98b44b1f87953a4c2dbf7a5e98f7aa2 (diff) | |
| download | debootstrap-75f38d0792862e2896d1adf27528e70751a301f2.tar.gz | |
Some trivial fixed for Illumos, unstable = bok
| -rw-r--r-- | scripts/bok | 18 | ||||
| l--------- | scripts/unstable | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/scripts/bok b/scripts/bok index 893d5d5..b8d9753 100644 --- a/scripts/bok +++ b/scripts/bok @@ -9,10 +9,7 @@ if doing_variant fakechroot; then fi case $ARCH in - alpha|ia64) LIBC="libc6.1" ;; - kfreebsd-*) LIBC="libc0.1" ;; - hurd-*) LIBC="libc0.3" ;; - *) LIBC="libc6" ;; + *) LIBC="libc1" ;; esac work_out_debs () { @@ -42,9 +39,9 @@ first_stage_install () { : >"$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" + if [ ! -e "$TARGET/etc/vfstab" ]; then + echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/vfstab" + chown 0:0 "$TARGET/etc/vfstab"; chmod 644 "$TARGET/etc/vfstab" fi x_feign_install () { @@ -83,7 +80,6 @@ second_stage_install () { true else setup_proc - in_target /sbin/ldconfig fi DEBIAN_FRONTEND=noninteractive @@ -102,10 +98,6 @@ second_stage_install () { 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 @@ -139,7 +131,6 @@ second_stage_install () { info CONFREQ "Configuring required packages..." - mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" echo \ "#!/bin/sh echo @@ -184,7 +175,6 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/ 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/scripts/unstable b/scripts/unstable index 9a63c96..3fca7c6 120000 --- a/scripts/unstable +++ b/scripts/unstable @@ -1 +1 @@ -sid
\ No newline at end of file +bok
\ No newline at end of file |