diff options
| author | Roger Leigh <rleigh@debian.org> | 2010-02-09 23:16:07 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2010-02-09 23:16:07 +0000 |
| commit | c2d1130aa98445d69dbfa8106a4d3f50cbc21144 (patch) | |
| tree | d16e87f25f19e101a2c47ceb33de762a3e083425 /etc | |
| parent | 6423cb722625edd89ae0514ba9a3229b91da3808 (diff) | |
| download | schroot-c2d1130aa98445d69dbfa8106a4d3f50cbc21144.tar.gz | |
Add AUTH* environment variables storing host triplet
Use in setup scripts in place of PLATFORM
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/setup.d/00check | 17 | ||||
| -rwxr-xr-x | etc/setup.d/10mount | 40 |
2 files changed, 35 insertions, 22 deletions
diff --git a/etc/setup.d/00check b/etc/setup.d/00check index e3dcaf9f..e512013a 100755 --- a/etc/setup.d/00check +++ b/etc/setup.d/00check @@ -53,6 +53,10 @@ if [ "$AUTH_VERBOSITY" = "verbose" ]; then echo "MOUNT_DIR=$MOUNT_DIR" echo "LIBEXEC_DIR=$LIBEXEC_DIR" echo "PID=$PID" + echo "HOST=$HOST" + echo "HOST_OS=$HOST_OS" + echo "HOST_VENDOR=$HOST_VENDOR" + echo "HOST_CPU=$HOST_CPU" echo "PLATFORM=$PLATFORM" echo "SESSION_ID=$SESSION_ID" echo "CHROOT_TYPE=$CHROOT_TYPE" @@ -117,11 +121,14 @@ case "$CHROOT_TYPE" in fi ;; block-device | lvm-snapshot) - if [ "$PLATFORM" = "freebsd" ]; then - DEVTYPE="-c" - else - DEVTYPE="-b" - fi + case "$HOST_OS" in + freebsd* | k*bsd*-gnu) : + DEVTYPE="-c" + ;; + *): + DEVTYPE="-b" + ;; + esac if [ ! "$DEVTYPE" "$CHROOT_DEVICE" ]; then echo "Device '$CHROOT_DEVICE' does not exist" diff --git a/etc/setup.d/10mount b/etc/setup.d/10mount index 7c4501ca..cab9a465 100755 --- a/etc/setup.d/10mount +++ b/etc/setup.d/10mount @@ -103,11 +103,14 @@ if [ "$CHROOT_TYPE" = "directory" ] || [ "$CHROOT_TYPE" = "file" ] || [ "$CHROOT CREATE_UNION="no" fi - if [ "$PLATFORM" = "freebsd" ]; then - BINDOPT="-t nullfs" - else - BINDOPT="--bind" - fi + case "$HOST_OS" in + freebsd* | k*bsd*-gnu) : + BINDOPT="-t nullfs" + ;; + *): + BINDOPT="--bind" + ;; + esac if [ "$CHROOT_TYPE" = "directory" ]; then CHROOT_MOUNT_OPTIONS="$BINDOPT" @@ -118,20 +121,23 @@ if [ "$CHROOT_TYPE" = "directory" ] || [ "$CHROOT_TYPE" = "file" ] || [ "$CHROOT CHROOT_MOUNT_DEVICE="${CHROOT_FILE_UNPACK_DIR}/${SESSION_ID}" elif [ "$CHROOT_TYPE" = "loopback" ]; then - if [ "$PLATFORM" = "freebsd" ]; then - LOOP_DEVICE="/dev/$(/sbin/mdconfig -a -t vnode -f "$CHROOT_FILE")" - CHROOT_MOUNT_DEVICE="$LOOP_DEVICE" - CHROOT_MOUNT_OPTIONS="" - else - LOOP_DEVICE="$(/sbin/losetup -j "$CHROOT_FILE" | sed -e 's/:.*$//')" - if [ -z "$LOOP_DEVICE" ]; then - CHROOT_MOUNT_DEVICE="$CHROOT_FILE" - CHROOT_MOUNT_OPTIONS="${CHROOT_MOUNT_OPTIONS},loop" - else + case "$HOST_OS" in + freebsd* | k*bsd*-gnu) : + LOOP_DEVICE="/dev/$(/sbin/mdconfig -a -t vnode -f "$CHROOT_FILE")" CHROOT_MOUNT_DEVICE="$LOOP_DEVICE" CHROOT_MOUNT_OPTIONS="" - fi - fi + ;; + *): + LOOP_DEVICE="$(/sbin/losetup -j "$CHROOT_FILE" | sed -e 's/:.*$//')" + if [ -z "$LOOP_DEVICE" ]; then + CHROOT_MOUNT_DEVICE="$CHROOT_FILE" + CHROOT_MOUNT_OPTIONS="${CHROOT_MOUNT_OPTIONS},loop" + else + CHROOT_MOUNT_DEVICE="$LOOP_DEVICE" + CHROOT_MOUNT_OPTIONS="" + fi + ;; + esac fi if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then |