Now starting /usr/bin/login by default

This commit is contained in:
Pierre Pronchery 2014-04-12 22:37:03 +02:00
parent 24d795a064
commit 883e12ad55

View File

@ -41,15 +41,15 @@ _image_image_pre()
IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \ IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \
MKNOD MOUNT MV UMOUNT VNCONFIG VND MKNOD MOUNT MV UMOUNT VNCONFIG VND
$MKDIR -- "$DESTDIR" || exit 2 $MKDIR -- "$DESTDIR" || return 2
$DEBUG $SUDO $UMOUNT "$DESTDIR" $DEBUG $SUDO $UMOUNT "$DESTDIR"
$DEBUG $SUDO $VNCONFIG -u "$VND" $DEBUG $SUDO $VNCONFIG -u "$VND"
$DEBUG $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" && $DEBUG $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
$DEBUG $FDISK -Ffi "$IMAGE_FILE" || exit 2 $DEBUG $FDISK -Ffi "$IMAGE_FILE" || return 2
SIZE=$((IMAGE_SIZE * 2 - 63)) SIZE=$((IMAGE_SIZE * 2 - 63))
$DEBUG $FDISK -Ffu0s "169/63/$SIZE" "$IMAGE_FILE" || exit 2 $DEBUG $FDISK -Ffu0s "169/63/$SIZE" "$IMAGE_FILE" || return 2
$DEBUG $FDISK -Ffa0 "$IMAGE_FILE" || exit 2 $DEBUG $FDISK -Ffa0 "$IMAGE_FILE" || return 2
$DEBUG $SUDO $VNCONFIG -c "$VND" "$IMAGE_FILE" || exit 2 $DEBUG $SUDO $VNCONFIG -c "$VND" "$IMAGE_FILE" || return 2
$DEBUG $SUDO $MBRLABEL -frw "$VND" && $DEBUG $SUDO $MBRLABEL -frw "$VND" &&
$DEBUG $SUDO $MKFS "${VND}e" && $DEBUG $SUDO $MKFS "${VND}e" &&
$DEBUG $SUDO $MOUNT "/dev/${VND}e" "$DESTDIR" && $DEBUG $SUDO $MOUNT "/dev/${VND}e" "$DESTDIR" &&
@ -59,44 +59,87 @@ _image_image_pre()
_image_image_post() _image_image_post()
{ {
$DEBUG $SUDO $CHOWN -R "0:0" "$DESTDIR" && #fix the permissions
$DEBUG $SUDO $MKDIR -- "$DESTDIR/bin" && $DEBUG $SUDO $CHOWN -R "0:0" "$DESTDIR" || return 2
$DEBUG $SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh" && #/bin/sh
$DEBUG $SUDO $MKDIR -- "$DESTDIR/dev" && $DEBUG $SUDO $MKDIR -- "$DESTDIR/bin" || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/console" c 0 0 && $DEBUG $SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh" \
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0a" b 0 0 && || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0b" b 0 1 && #create essential device nodes
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0c" b 0 2 && $DEBUG $SUDO $MKDIR -- "$DESTDIR/dev"
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0d" b 0 3 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/console" c 0 0|| return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0e" b 0 4 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0a" b 0 0 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0f" b 0 5 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0b" b 0 1 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0g" b 0 6 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0c" b 0 2 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0h" b 0 7 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0d" b 0 3 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0a" c 3 0 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0e" b 0 4 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0b" c 3 1 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0f" b 0 5 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0c" c 3 2 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0g" b 0 6 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0d" c 3 3 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/hd0h" b 0 7 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0e" c 3 4 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0a" c 3 0 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0f" c 3 5 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0b" c 3 1 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0g" c 3 6 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0c" c 3 2 || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0h" c 3 7 && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0d" c 3 3 || return 2
$DEBUG $SUDO $MKDIR -- "$DESTDIR/etc" && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0e" c 3 4 || return 2
$DEBUG $SUDO $MKDIR -- "$DESTDIR/libexec" \ $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0f" c 3 5 || return 2
"$DESTDIR/usr/libexec" && $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0g" c 3 6 || return 2
$DEBUG $SUDO $INSTALL -m 0555 "$LDSO" \ $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/rhd0h" c 3 7 || return 2
"$DESTDIR/libexec/ld.elf_so" && #/etc
$DEBUG $SUDO $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"&& $DEBUG $SUDO $MKDIR -- "$DESTDIR/etc" || return 2
$DEBUG $SUDO $MKDIR -- "$DESTDIR/proc" && #/etc/fstab
$DEBUG $SUDO $MKDIR -- "$DESTDIR/sbin" && $SUDO sh -c "cat > $DESTDIR/etc/fstab" << EOF
SUBDIRS="Apps/Unix/src/others/others-git/tools" _target oinit && /dev/hd0e / ffs rw 1 1
procfs /proc procfs rw
EOF
[ $? -eq 0 ] || return 2
$DEBUG $SUDO $CHMOD -- "0644" "$DESTDIR/etc/fstab" || return 2
#/etc/group
$SUDO sh -c "cat > $DESTDIR/etc/group" << EOF
wheel:*:0:
EOF
[ $? -eq 0 ] || return 2
$DEBUG $SUDO $CHMOD -- "0644" "$DESTDIR/etc/group" || return 2
#/etc/passwd
$SUDO sh -c "cat > $DESTDIR/etc/passwd" << EOF
root::0:0:Superuser:/root:/bin/sh
EOF
[ $? -eq 0 ] || return 2
$DEBUG $SUDO $CHMOD -- "0644" "$DESTDIR/etc/passwd" || return 2
#/etc/rc
$SUDO sh -c "cat > $DESTDIR/etc/rc" << EOF
#!/bin/sh
echo "Welcome to DeforaOS!"
echo
$PREFIX/bin/login
EOF
[ $? -eq 0 ] || return 2
$DEBUG $SUDO $CHMOD -- "0755" "$DESTDIR/etc/rc" || return 2
#/libexec/ld.elf_so
$DEBUG $SUDO $MKDIR -- "$DESTDIR/libexec" || return 2
$DEBUG $SUDO $INSTALL -m 0555 "$LDSO" "$DESTDIR/libexec/ld.elf_so" \
|| return 2
#/usr/libexec/ld.elf_so
$DEBUG $SUDO $MKDIR -- "$DESTDIR$PREFIX/libexec" || return 2
$DEBUG $SUDO $LN -s "/libexec/ld.elf_so" \
"$DESTDIR$PREFIX/libexec" || return 2
#/proc
$DEBUG $SUDO $MKDIR -- "$DESTDIR/proc" || return 2
#/sbin/init
$DEBUG $SUDO $MKDIR -- "$DESTDIR/sbin" || return 2
SUBDIRS="Apps/Unix/src/others/others-git/tools" _target \
oinit || return 2
$DEBUG $SUDO $INSTALL -m 0755 \ $DEBUG $SUDO $INSTALL -m 0755 \
"Apps/Unix/src/others/others-git/tools/oinit" \ "Apps/Unix/src/others/others-git/tools/oinit" \
"$DESTDIR/sbin/init" && "$DESTDIR/sbin/init" || return 2
$DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_BOOT" "$DESTDIR/boot" && #/boot
$DEBUG $SUDO $INSTALL -m 0444 "$IMAGE_BOOT" "$DESTDIR/boot" \
|| return 2
#/boot.cfg
BOOT_SPLASH="vesa 640x480x8;boot netbsd" BOOT_SPLASH="vesa 640x480x8;boot netbsd"
if [ -n "$IMAGE_SPLASH" ]; then if [ -n "$IMAGE_SPLASH" ]; then
$DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \ $DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \
"$DESTDIR/netbsd.jpeg" || exit 2 "$DESTDIR/netbsd.jpeg" || return 2
BOOT_SPLASH="vesa 640x480x8;splash /netbsd.jpeg;boot netbsd -z" BOOT_SPLASH="vesa 640x480x8;splash /netbsd.jpeg;boot netbsd -z"
fi fi
$SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF $SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF
@ -112,16 +155,18 @@ menu=Drop to boot prompt:prompt
default=1 default=1
timeout=10 timeout=10
EOF EOF
[ $? -eq 0 ] || return 2
if [ -n "$IMAGE_KERNEL" ]; then if [ -n "$IMAGE_KERNEL" ]; then
#/netbsd
$DEBUG $SUDO $INSTALL -m 0755 "$IMAGE_KERNEL" \ $DEBUG $SUDO $INSTALL -m 0755 "$IMAGE_KERNEL" \
"$DESTDIR/netbsd" && "$DESTDIR/netbsd" || return 2
$DEBUG $SUDO $INSTALLBOOT -m "$MACHINE" -o "timeout=10" \ $DEBUG $SUDO $INSTALLBOOT -m "$MACHINE" -o "timeout=10" \
"/dev/r${VND}e" "/usr/mdec/bootxx_ffsv1" "/dev/r${VND}e" "/usr/mdec/bootxx_ffsv1"|| return 2
fi fi
ret=$? #FIXME these should always be called (to recover)
$DEBUG $SUDO $UMOUNT "$DESTDIR" $DEBUG $SUDO $UMOUNT "$DESTDIR"
$DEBUG $SUDO $VNCONFIG -u "$VND" $DEBUG $SUDO $VNCONFIG -u "$VND"
return $ret return 0
} }
@ -145,32 +190,32 @@ _image_iso_pre()
_image_iso_post() _image_iso_post()
{ {
$DEBUG $MKDIR -- "$DESTDIR/dev" || exit 2 $DEBUG $MKDIR -- "$DESTDIR/dev" || return 2
$DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/console" c 0 0 \ $DEBUG $SUDO $MKNOD -m 0600 "$DESTDIR/dev/console" c 0 0 \
|| exit 2 || return 2
$DEBUG $MKDIR -- "$DESTDIR/libexec" "$DESTDIR/usr/libexec" \ $DEBUG $MKDIR -- "$DESTDIR/libexec" "$DESTDIR/usr/libexec" \
|| exit 2 || return 2
$DEBUG $INSTALL -m 0555 "$LDSO" "$DESTDIR/libexec/ld.elf_so" \ $DEBUG $INSTALL -m 0555 "$LDSO" "$DESTDIR/libexec/ld.elf_so" \
|| exit 2 || return 2
$DEBUG $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec" \ $DEBUG $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec" \
|| exit 2 || return 2
$DEBUG $MKDIR -- "$DESTDIR/sbin" || exit 2 $DEBUG $MKDIR -- "$DESTDIR/sbin" || return 2
SUBDIRS="Apps/Unix/src/others/others-git/tools" _target oinit \ SUBDIRS="Apps/Unix/src/others/others-git/tools" _target oinit \
|| exit 2 || return 2
$DEBUG $INSTALL -m 0755 "Apps/Unix/src/others/others-git/tools/oinit" \ $DEBUG $INSTALL -m 0755 "Apps/Unix/src/others/others-git/tools/oinit" \
"$DESTDIR/sbin/init" || exit 2 "$DESTDIR/sbin/init" || return 2
$DEBUG $INSTALL -m 0755 "$IMAGE_KERNEL" "$DESTDIR/netbsd" \ $DEBUG $INSTALL -m 0755 "$IMAGE_KERNEL" "$DESTDIR/netbsd" \
|| exit 2 || return 2
if [ -n "$IMAGE_RAMDISK" ]; then if [ -n "$IMAGE_RAMDISK" ]; then
$DEBUG $MDSETIMAGE "$DESTDIR/netbsd" "$IMAGE_RAMDISK" \ $DEBUG $MDSETIMAGE "$DESTDIR/netbsd" "$IMAGE_RAMDISK" \
|| exit 2 || return 2
fi fi
$DEBUG $GZIP -9 "$DESTDIR/netbsd" || exit 2 $DEBUG $GZIP -9 "$DESTDIR/netbsd" || return 2
$DEBUG $INSTALL -m 0644 "$IMAGE_BOOT" "$DESTDIR/boot" || exit 2 $DEBUG $INSTALL -m 0644 "$IMAGE_BOOT" "$DESTDIR/boot" || return 2
BOOT_SPLASH="vesa 640x480x8;boot netbsd" BOOT_SPLASH="vesa 640x480x8;boot netbsd"
if [ -n "$IMAGE_SPLASH" ]; then if [ -n "$IMAGE_SPLASH" ]; then
$DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \ $DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \
"$DESTDIR/netbsd.jpeg" || exit 2 "$DESTDIR/netbsd.jpeg" || return 2
BOOT_SPLASH="vesa 640x480x8;splash /netbsd.jpeg;boot netbsd -z" BOOT_SPLASH="vesa 640x480x8;splash /netbsd.jpeg;boot netbsd -z"
fi fi
$SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF $SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF
@ -187,8 +232,8 @@ default=1
timeout=10 timeout=10
EOF EOF
$DEBUG $INSTALL -m 0644 "/usr/mdec/bootxx_cd9660" "bootxx" \ $DEBUG $INSTALL -m 0644 "/usr/mdec/bootxx_cd9660" "bootxx" \
|| exit 2 || return 2
$DEBUG $INSTALLBOOT -m "$MACHINE" -o "$BOOTOPTIONS" -e bootxx \ $DEBUG $INSTALLBOOT -m "$MACHINE" -o "$BOOTOPTIONS" -e bootxx \
|| exit 2 || return 2
$DEBUG $MKISOFS $MKISOFS_ARGS "$IMAGE_FILE" "$DESTDIR" || exit 2 $DEBUG $MKISOFS $MKISOFS_ARGS "$IMAGE_FILE" "$DESTDIR" || return 2
} }