Close #9
Unified · Split
| @@ -0,0 +1,15 @@ | ||
| 1 | +############################################################################### | |
| 2 | + | |
| 3 | +Welcome to the Void Linux Live system, you have been autologged in. | |
| 4 | +This user has full sudo(8) permissions without any password, be careful | |
| 5 | +executing commands through sudo(8). | |
| 6 | + | |
| 7 | +To start the installation please type: | |
| 8 | + | |
| 9 | + $ sudo void-installer | |
| 10 | + | |
| 11 | +and follow the on-screen instructions. Thanks for using Void Linux. | |
| 12 | + | |
| 13 | + http://www.voidlinux.eu | |
| 14 | + | |
| 15 | +############################################################################### | |
File renamed without changes.
| @@ -44,28 +44,6 @@ error_out() { · 43 unmodified lines | ||
| 44 | 44 | exit 1 |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | −write_etc_motd() { | |
| 48 | − cat >> "$ROOTFS/etc/motd" <<_EOF | |
| 49 | −############################################################################### | |
| 50 | − Autogenerated by void-mklive "@@MKLIVE_VERSION@@" | |
| 51 | −############################################################################### | |
| 52 | − | |
| 53 | −Welcome to the Void Linux Live system, you have been autologged in. | |
| 54 | −This user has full sudo(8) permissions without any password, be careful | |
| 55 | −executing commands through sudo(8). | |
| 56 | − | |
| 57 | −To start the installation please type: | |
| 58 | − | |
| 59 | − $ sudo void-installer | |
| 60 | − | |
| 61 | −and follow the on-screen instructions. Thanks for using Void Linux. | |
| 62 | − | |
| 63 | − http://www.voidlinux.eu | |
| 64 | − | |
| 65 | −############################################################################### | |
| 66 | −_EOF | |
| 67 | −} | |
| 68 | − | |
| 69 | 47 | usage() { |
| 70 | 48 | cat <<_EOF |
| 71 | 49 | Usage: $(basename $0) [options] |
| @@ -157,9 +135,9 @@ generate_isolinux_boot() { · 85 unmodified lines | ||
| 157 | 135 | cp -f $SYSLINUX_DATADIR/libutil.c32 "$ISOLINUX_DIR" |
| 158 | 136 | cp -f $SYSLINUX_DATADIR/chain.c32 "$ISOLINUX_DIR" |
| 159 | 137 | cp -f isolinux/isolinux.cfg.in "$ISOLINUX_DIR"/isolinux.cfg |
| 160 | − cp -f isolinux/${SPLASH_IMAGE} "$ISOLINUX_DIR" | |
| 138 | + cp -f ${SPLASH_IMAGE} "$ISOLINUX_DIR" | |
| 161 | 139 | |
| 162 | − sed -i -e "s|@@SPLASHIMAGE@@|${SPLASH_IMAGE}|" \ | |
| 140 | + sed -i -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \ | |
| 163 | 141 | -e "s|@@KERNVER@@|${KERNELVERSION}|" \ |
| 164 | 142 | -e "s|@@KEYMAP@@|${KEYMAP}|" \ |
| 165 | 143 | -e "s|@@ARCH@@|$(uname -m)|" \ |
| @@ -169,7 +147,7 @@ generate_isolinux_boot() { · 3 unmodified lines | ||
| 169 | 147 | generate_grub_efi_boot() { |
| 170 | 148 | cp -f grub/grub.cfg $GRUB_DIR |
| 171 | 149 | cp -f grub/grub_void.cfg.in $GRUB_DIR/grub_void.cfg |
| 172 | − sed -i -e "s|@@SPLASHIMAGE@@|${SPLASH_IMAGE}|" \ | |
| 150 | + sed -i -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \ | |
| 173 | 151 | -e "s|@@KERNVER@@|${KERNELVERSION}|" \ |
| 174 | 152 | -e "s|@@KEYMAP@@|${KEYMAP}|" \ |
| 175 | 153 | -e "s|@@ARCH@@|$(uname -m)|" \ |
| @@ -251,7 +229,7 @@ done · 75 unmodified lines | ||
| 251 | 229 | shift $(($OPTIND - 1)) |
| 252 | 230 | |
| 253 | 231 | # Set defaults |
| 254 | −: ${XBPS_CACHEDIR=--cachedir=/var/cache/xbps} | |
| 232 | +: ${XBPS_CACHEDIR:=--cachedir=/var/cache/xbps} | |
| 255 | 233 | : ${KEYMAP:=us} |
| 256 | 234 | : ${LOCALE:=en_US.UTF-8} |
| 257 | 235 | : ${INITRAMFS_COMPRESSION:=xz} |
| @@ -288,7 +266,7 @@ ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" · 30 unmodified lines | ||
| 288 | 266 | |
| 289 | 267 | : ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current} |
| 290 | 268 | : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux} |
| 291 | −: ${SPLASH_IMAGE:=splash.png} | |
| 269 | +: ${SPLASH_IMAGE:=data/splash.png} | |
| 292 | 270 | : ${XBPS_INSTALL_CMD:=xbps-install} |
| 293 | 271 | : ${XBPS_REMOVE_CMD:=xbps-remove} |
| 294 | 272 | : ${XBPS_QUERY_CMD:=xbps-query} |
| @@ -327,7 +305,7 @@ install_packages · 32 unmodified lines | ||
| 327 | 305 | # Prepare /etc/motd. |
| 328 | 306 | # |
| 329 | 307 | mkdir -p "$ROOTFS"/etc |
| 330 | −write_etc_motd | |
| 308 | +[ -s data/motd ] && cp data/motd $ROOTFS/etc | |
| 331 | 309 | |
| 332 | 310 | export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH |
| 333 | 311 | export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib |
