From 2cb27b0045284d7085b3f0cb5dbd9122877d074b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 29 May 2012 14:11:27 +0200 Subject: [PATCH] vmklive: add some missing changes from 0.8. --- srcpkgs/vmklive/files/dracut-vmklive-adduser.sh | 2 +- srcpkgs/vmklive/files/mklive.sh.in | 7 +++++++ srcpkgs/vmklive/template | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vmklive/files/dracut-vmklive-adduser.sh b/srcpkgs/vmklive/files/dracut-vmklive-adduser.sh index 03277af5872..9f95c6576a8 100644 --- a/srcpkgs/vmklive/files/dracut-vmklive-adduser.sh +++ b/srcpkgs/vmklive/files/dracut-vmklive-adduser.sh @@ -10,7 +10,7 @@ echo "USERNAME=$USERNAME" >> ${NEWROOT}/etc/default/live.conf chmod 644 ${NEWROOT}/etc/default/live.conf # Create new user and remove password. We'll use autologin by default. -chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G audio,video,wheel -s /bin/bash +chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G audio,video,wheel -s /bin/sh chroot ${NEWROOT} passwd -d $USERNAME 2>&1 >/dev/null # Enable sudo permission by default. diff --git a/srcpkgs/vmklive/files/mklive.sh.in b/srcpkgs/vmklive/files/mklive.sh.in index fbbd4fe5c31..4f30e6eb0e5 100644 --- a/srcpkgs/vmklive/files/mklive.sh.in +++ b/srcpkgs/vmklive/files/mklive.sh.in @@ -381,6 +381,13 @@ for f in $ROOTFS_REPODIR/*; do rm -f $f/rindex-files.plist done +# install lsblk and blkid from util-linux. to avoid installing +# the whole package. +_lsblk=$(which lsblk) +_blkid=$(which blkid) +install -Dm755 ${_lsblk} "$ROOTFS/usr/bin/lsblk" || error_out $? +install -Dm755 ${_blkid} "$ROOTFS/sbin/blkid" || error_out $? + # # The pseudofs aren't needed anymore in target rootfs. # diff --git a/srcpkgs/vmklive/template b/srcpkgs/vmklive/template index f30b819e275..7af8f8070da 100644 --- a/srcpkgs/vmklive/template +++ b/srcpkgs/vmklive/template @@ -1,6 +1,6 @@ # Template file for 'vmklive' pkgname=vmklive -version=0.9.0 +version=0.9.1 replaces="xbps-mklive>=0 vanilla-mklive>=0" noextract=yes noarch=yes