diff options
| author | Julien Cristau <jcristau@debian.org> | 2016-10-20 06:39:55 (GMT) |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2016-10-20 06:39:55 (GMT) |
| commit | 5cf331b568827a9bce557db72c2713d8d7468bff (patch) | |
| tree | 76794a930ebaf4014f6bf74c731e4048adc9e01a /scripts | |
| parent | cb32574a472d4645ecdf176bef9e671c977c4d1f (diff) | |
| parent | 6b4019d0d4911cdb337ad8204891223c9f323829 (diff) | |
| download | debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.zip debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.gz debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.bz2 | |
Merge branch 'master' of https://github.com/aburch/debootstrap
Diffstat (limited to 'scripts')
| l--------- | scripts/bullseye | 1 | ||||
| l--------- | scripts/buster | 1 | ||||
| l--------- | scripts/oldoldstable | 1 | ||||
| -rw-r--r-- | scripts/sid | 27 |
4 files changed, 19 insertions, 11 deletions
diff --git a/scripts/bullseye b/scripts/bullseye new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/bullseye @@ -0,0 +1 @@ +sid
\ No newline at end of file diff --git a/scripts/buster b/scripts/buster new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/buster @@ -0,0 +1 @@ +sid
\ No newline at end of file diff --git a/scripts/oldoldstable b/scripts/oldoldstable new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/oldoldstable @@ -0,0 +1 @@ +sid
\ No newline at end of file diff --git a/scripts/sid b/scripts/sid index ceedd66..0b289f9 100644 --- a/scripts/sid +++ b/scripts/sid @@ -42,8 +42,11 @@ work_out_debs () { first_stage_install () { case "$CODENAME" in - etch|etch-m68k|jessie|lenny|squeeze|wheezy) ;; - *) setup_merged_usr ;; + etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;; + *) + EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" + setup_merged_usr + ;; esac extract $required @@ -191,17 +194,19 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/ done_predeps="$done_predeps $predep" done - smallyes '' | - (repeatn 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 + if [ -n "$base" ]; then + smallyes '' | + (repeatn 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..." + info CONFBASE "Configuring the base system..." - smallyes '' | - (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ - 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 + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + 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 + fi mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" rm -f "$TARGET/usr/sbin/policy-rc.d" |