diff options
Diffstat (limited to 'scripts/live-bottom')
| -rwxr-xr-x | scripts/live-bottom/02_timezone | 16 | ||||
| -rwxr-xr-x | scripts/live-bottom/12fstab | 10 |
2 files changed, 23 insertions, 3 deletions
diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone index bafc426..10b634e 100755 --- a/scripts/live-bottom/02_timezone +++ b/scripts/live-bottom/02_timezone @@ -26,6 +26,20 @@ log_begin_msg "Setting timezone..." # live-initramfs script -cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime +if [ -n "${TIMEZONE}" ]; then + area="$(echo ${TIMEZONE} | cut -f1 -d '/')" + zone="$(echo ${TIMEZONE} | cut -f2 -d '/')" + chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF +set tzdata/Areas $area +set tzdata/Zones/$area $zone +EOF + cp -f /root/usr/share/zoneinfo/${area}/${zone} /root/etc/localtime +else + chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF +set tzdata/Areas Etc +set tzdata/Zones/Etc UTC +EOF + cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime +fi log_end_msg diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab index 389f53e..9c8bfd7 100755 --- a/scripts/live-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -29,10 +29,16 @@ log_begin_msg "Configuring fstab..." FSTAB=/root/etc/fstab cat > $FSTAB <<EOF -unionfs / unionfs rw 0 0 +${UNIONTYPE} / ${UNIONTYPE} rw 0 0 tmpfs /tmp tmpfs nosuid,nodev 0 0 EOF -rm -f /root/etc/rcS.d/S*checkroot.sh +# disabled for now +#rm -f /root/etc/rcS.d/S*checkroot.sh + +if [ "${NOFASTBOOT}" != "Yes" ] +then + touch root/fastboot +fi log_end_msg |