manuel
/
void-mklive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4 from Gottox/master 

Typo fix
This commit is contained in:
Juan RP 2014-01-22 09:28:06 -08:00
parent eb14a02029 9683dc0045
commit 1da8db0c36
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mkimage.sh.in
View File

@ -32,7 +32,11 @@ trap 'printf "\nInterrupted! exiting...\n"; cleanup; exit 0' INT TERM HUP
cleanup() { cleanup() {
umount -f ${ROOTFSDIR}/boot 2>/dev/null umount -f ${ROOTFSDIR}/boot 2>/dev/null
umount -f ${ROOTFSDIR} 2>/dev/null umount -f ${ROOTFSDIR} 2>/dev/null
[ -e "$LOOPDEV" ] && losetup -d $LOOPDEV 2>/dev/null if [ -e "$LOOPDEV" ]; then
partx -d $LOOPDEV 2>/dev/null
losetup -d $LOOPDEV 2>/dev/null
fi
[ -d "$ROOTFSDIR" ] && rmdir $ROOTFSDIR [ -d "$ROOTFSDIR" ] && rmdir $ROOTFSDIR
} }
@ -102,25 +106,27 @@ if [ -z "$FILENAME" ]; then
FILENAME="void-image-$(date +%Y%m%d).img" FILENAME="void-image-$(date +%Y%m%d).img"
fi fi
for f in parted losetup mount mkfs.${BOOT_FSTYPE} mkfs.${ROOT_FSTYPE}; do for f in parted partx losetup mount mkfs.${BOOT_FSTYPE} mkfs.${ROOT_FSTYPE}; do
if ! which ${f} >/dev/null; then if ! which ${f} >/dev/null; then
die "Cannot find ${f}, exiting." die "Cannot find ${f}, exiting."
fi fi
done done
info_msg "Creating disk image ($IMGSIZE) ..." info_msg "Creating disk image ($IMGSIZE) ..."
dd if=/dev/zero of=$FILENAME bs=$IMGSIZE count=1 conv=sparse >/dev/null 2>&1 dd if=/dev/zero of=$FILENAME bs=$IMGSIZE count=1 >/dev/null 2>&1
info_msg "Creating disk image partitions/filesystems ..." info_msg "Creating disk image partitions/filesystems ..."
parted $FILENAME mktable msdos parted $FILENAME mktable msdos
if [ "$BOOT_FSTYPE" = "vfat" ]; then if [ "$BOOT_FSTYPE" = "vfat" ]; then
_btype="fat32" _btype="fat32"
_args="-I"
fi fi
parted $FILENAME mkpart primary ${_btype} 4096s 256M parted $FILENAME mkpart primary ${_btype} 4096s 256M
parted $FILENAME mkpart primary ext2 256M 100% parted $FILENAME mkpart primary ext2 256M 100%
parted $FILENAME toggle 1 boot parted $FILENAME toggle 1 boot
LOOPDEV=$(losetup --show --find -P $FILENAME) LOOPDEV=$(losetup --show --find $FILENAME)
mkfs.${BOOT_FSTYPE} ${LOOPDEV}p1 >/dev/null 2>&1 partx -a $LOOPDEV
mkfs.${BOOT_FSTYPE} $_args ${LOOPDEV}p1 >/dev/null
mkfs.${ROOT_FSTYPE} ${LOOPDEV}p2 >/dev/null 2>&1 mkfs.${ROOT_FSTYPE} ${LOOPDEV}p2 >/dev/null 2>&1
info_msg "Unpacking rootfs tarball ..." info_msg "Unpacking rootfs tarball ..."
@ -141,6 +147,7 @@ fi
umount ${ROOTFSDIR}/boot umount ${ROOTFSDIR}/boot
umount $ROOTFSDIR umount $ROOTFSDIR
partx -d $LOOPDEV
losetup -d $LOOPDEV losetup -d $LOOPDEV
rmdir $ROOTFSDIR rmdir $ROOTFSDIR

2
mkrootfs.sh.in
View File

@ -132,7 +132,7 @@ fi
# #
rootfs=$(mktemp -d || die "FATAL: failed to create tempdir, exiting...") rootfs=$(mktemp -d || die "FATAL: failed to create tempdir, exiting...")
if [ ! -f "$KEYSDIR/${VOIDRSAPUBKEY}.plist" ]; then if [ ! -f "$KEYSDIR/${VOIDRSAPUBKEY}.plist" ]; then
die "cannot find xbps keyst to install binary packages, exiting." die "cannot find xbps keys to install binary packages, exiting."
fi fi
mkdir -p $rootfs/var/db/xbps/keys mkdir -p $rootfs/var/db/xbps/keys
cp $KEYSDIR/${VOIDRSAPUBKEY}.plist $rootfs/var/db/xbps/keys cp $KEYSDIR/${VOIDRSAPUBKEY}.plist $rootfs/var/db/xbps/keys