3 commits - tools/livecd-iso-to-disk.sh
by Brian C. Lane
tools/livecd-iso-to-disk.sh | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 1099cf09f0c7a80bf4116499b192be288eaff983
Author: Frederick Grose <fgrose(a)gmail.com>
Date: Thu Mar 10 16:57:55 2011 -0800
Create an ext4 filesystem by default for home.img
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index c845a3d..8cdf86e 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1152,14 +1152,14 @@ if [ "$homesizemb" -gt 0 -a -z "$skipcopy" ]; then
cryptsetup luksOpen $loop EncHomeFoo
setupworked=$?
done
- mke2fs -j /dev/mapper/EncHomeFoo
+ mkfs.ext4 -j /dev/mapper/EncHomeFoo
tune2fs -c0 -i0 -ouser_xattr,acl /dev/mapper/EncHomeFoo
sleep 2
cryptsetup luksClose EncHomeFoo
losetup -d $loop
else
echo "Formatting unencrypted /home"
- mke2fs -F -j $TGTMNT/$LIVEOS/$HOMEFILE
+ mkfs.ext4 -F -j $TGTMNT/$LIVEOS/$HOMEFILE
tune2fs -c0 -i0 -ouser_xattr,acl $TGTMNT/$LIVEOS/$HOMEFILE
fi
fi
commit 67a7369c163d158a062d49f45590a8812846920b
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Mar 10 16:55:03 2011 -0800
Add error checks to home.img creation
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index d90c354..c845a3d 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1129,9 +1129,17 @@ if [ "$homesizemb" -gt 0 -a -z "$skipcopy" ]; then
else
dd if=/dev/null of=$TGTMNT/$LIVEOS/$HOMEFILE count=1 bs=1M seek=$homesizemb
fi
+ if [ $? -gt 0 ]; then
+ echo "Error creating $TGTMNT/$LIVEOS/$HOMEFILE"
+ exitclean
+ fi
if [ -n "$cryptedhome" ]; then
loop=$(losetup -f)
losetup $loop $TGTMNT/$LIVEOS/$HOMEFILE
+ if [ $? -gt 0 ]; then
+ echo "Error setting up $TGTMNT/$LIVEOS/$HOMEFILE on $loop"
+ exitclean
+ fi
setupworked=1
until [ ${setupworked} == 0 ]; do
echo "Encrypting persistent /home"
commit bdebbf99827346708e1183c54d09344f72360e12
Author: Frederick Grose <fgrose(a)gmail.com>
Date: Thu Mar 10 16:17:35 2011 -0800
livecd-iso-to-disk Detect more disk space issues
Trap oversized ext3fs.img request with --skipcompress on VFAT devices
Also, include /boot/olpc.fth in the install size estimate for the
--xo option.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index b7cee72..d90c354 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -872,6 +872,15 @@ if [[ -n $skipcompress ]] && [[ -s $SRCMNT/LiveOS/squashfs.img ]]; then
if mount -o loop $SRCMNT/LiveOS/squashfs.img $SRCMNT; then
livesize=($(du -B 1M --apparent-size $SRCMNT/LiveOS/ext3fs.img))
umount $SRCMNT
+ if ((livesize > 2048)) && [[ vfat == $TGTFS ]]; then
+ echo "
+ An uncompressed image size greater than 2048 MB is not suitable
+ for a VFAT-formatted device. The compressed SquashFS will be
+ copied to the target device.
+ "
+ skipcompress=""
+ livesize=0
+ fi
else
echo "WARNING: --skipcompress or --xo was specified but the
currently-running kernel can not mount the SquashFS from the source
@@ -886,6 +895,7 @@ if [[ live == $srctype ]]; then
[[ -z $skipcompress ]] && sources+=" $SRCMNT/LiveOS/squashfs.img"
sources+=" $SRCMNT/isolinux $SRCMNT/syslinux"
[[ -n $efi ]] && sources+=" $SRCMNT/EFI/boot"
+ [[ -n $xo ]] && sources+=" $SRCMNT/boot/olpc.fth"
duTable=($(du -c -B 1M "$thisScriptpath" $sources 2> /dev/null))
((livesize += ${duTable[*]: -2:1}))
fi
13 years, 1 month
[PATCH] livecd-iso-to-disk Create an ext4 filesystem by default for home.img
by Frederick Grose
Author: Frederick Grose <fgrose(a)gmail.com>
Date: Tue Mar 8 16:37:16 2011 -0500
Create an ext4 filesystem by default for home.img
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index b7cee72..071943c 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1134,14 +1134,14 @@ if [ "$homesizemb" -gt 0 -a -z "$skipcopy" ]; then
cryptsetup luksOpen $loop EncHomeFoo
setupworked=$?
done
- mke2fs -j /dev/mapper/EncHomeFoo
+ mke2fs -j -T ext4 /dev/mapper/EncHomeFoo
tune2fs -c0 -i0 -ouser_xattr,acl /dev/mapper/EncHomeFoo
sleep 2
cryptsetup luksClose EncHomeFoo
losetup -d $loop
else
echo "Formatting unencrypted /home"
- mke2fs -F -j $TGTMNT/$LIVEOS/$HOMEFILE
+ mke2fs -F -j -T ext4 $TGTMNT/$LIVEOS/$HOMEFILE
tune2fs -c0 -i0 -ouser_xattr,acl $TGTMNT/$LIVEOS/$HOMEFILE
fi
fi
13 years, 1 month
[PATCH] livecd-iso-to-disk Detect more disk space issues
by Frederick Grose
https://bugzilla.redhat.com/show_bug.cgi?id=656154#c2
<https://bugzilla.redhat.com/show_bug.cgi?id=656154#c2>
Author: Frederick Grose <fgrose(a)gmail.com>
Date: Tue Mar 8 17:28:18 2011 -0500
Trap oversized ext3fs.img request with --skipcompress on VFAT devices
Also, include /boot/olpc.fth in the install size estimate for the
--xo option.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index b7cee72..d90c354 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -872,6 +872,15 @@ if [[ -n $skipcompress ]] && [[ -s
$SRCMNT/LiveOS/squashfs.img ]]; then
if mount -o loop $SRCMNT/LiveOS/squashfs.img $SRCMNT; then
livesize=($(du -B 1M --apparent-size $SRCMNT/LiveOS/ext3fs.img))
umount $SRCMNT
+ if ((livesize > 2048)) && [[ vfat == $TGTFS ]]; then
+ echo "
+ An uncompressed image size greater than 2048 MB is not suitable
+ for a VFAT-formatted device. The compressed SquashFS will be
+ copied to the target device.
+ "
+ skipcompress=""
+ livesize=0
+ fi
else
echo "WARNING: --skipcompress or --xo was specified but the
currently-running kernel can not mount the SquashFS from the source
@@ -886,6 +895,7 @@ if [[ live == $srctype ]]; then
[[ -z $skipcompress ]] && sources+=" $SRCMNT/LiveOS/squashfs.img"
sources+=" $SRCMNT/isolinux $SRCMNT/syslinux"
[[ -n $efi ]] && sources+=" $SRCMNT/EFI/boot"
+ [[ -n $xo ]] && sources+=" $SRCMNT/boot/olpc.fth"
duTable=($(du -c -B 1M "$thisScriptpath" $sources 2> /dev/null))
((livesize += ${duTable[*]: -2:1}))
fi
13 years, 1 month
error during liveDVD build
by Danishka Navin
Could not build the LiveDVD based on Fedora 14 (both i386 and x86_64)
the liveDVD build was running on Fedora 14 x86_64 system
how to fix this issue?
/tmp/ks-script-L1ILbG: line 119: /usr/sbin/makewhatis: No such file or
directory
ignoring %post failure (code 127)
umount: /home/hn/tmp/imgcreate-ALTxRy/install_root/var/cache/yum: device is
busy.
(In some cases useful info about processes that use
the device is found by lsof(8) or fuser(1))
lazy umount succeeded on
/home/hn/tmp/imgcreate-ALTxRy/install_root//var/cache/yum
umount: /home/hn/tmp/imgcreate-ALTxRy/install_root: device is busy.
(In some cases useful info about processes that use
the device is found by lsof(8) or fuser(1))
Unmounting directory /home/hn/tmp/imgcreate-ALTxRy/install_root failed,
using lazy umount
lazy umount succeeded on /home/hn/tmp/imgcreate-ALTxRy/install_root
loop: can't delete device /dev/loop0: Device or resource busy
e2fsck 1.41.12 (17-May-2010)
_Hanthana-14.6-x: recovering journal
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
_Hanthana-14.6-x: ***** FILE SYSTEM WAS MODIFIED *****
_Hanthana-14.6-x: 359765/673296 files (0.2% non-contiguous), 2525766/2688000
blocks
e2image 1.41.12 (17-May-2010)
resize2fs 1.41.12 (17-May-2010)
Resizing the filesystem on
/home/hn/tmp/imgcreate-ALTxRy/tmp-vAieLm/ext3fs.img to 2525941 (4k) blocks.
The filesystem on /home/hn/tmp/imgcreate-ALTxRy/tmp-vAieLm/ext3fs.img is now
2525941 blocks long.
e2fsck 1.41.12 (17-May-2010)
_Hanthana-14.6-x: recovering journal
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
Block bitmap differences: -(1114112--1114295) -(2129920--2129921)
Fix? yes
Free blocks count wrong for group #34 (0, counted=184).
Fix? yes
Free blocks count wrong for group #65 (0, counted=2).
Fix? yes
Free blocks count wrong (3370, counted=3556).
Fix? yes
Inode bitmap differences: -(259589--259774) -(519171--519173)
Fix? yes
Free inodes count wrong for group #32 (0, counted=186).
Fix? yes
Free inodes count wrong for group #64 (0, counted=3).
Fix? yes
Free inodes count wrong (272971, counted=273160).
Fix? yes
_Hanthana-14.6-x: ***** FILE SYSTEM WAS MODIFIED *****
_Hanthana-14.6-x: 359576/632736 files (0.2% non-contiguous), 2522385/2525941
blocks
Error creating Live CD : fsck after resize returned an error! image to
debug at /tmp/resize-image-IEPJB3
--
Danishka Navin
http://danishkanavin.blogspot.com
http://twitter.com/danishkanavin
http://identi.ca/danishka
13 years, 1 month
compiling wireless drivers
by wbsec.flive＠new.rr.com
I use a USB with Fedora 14 to boot various different Windows computers. The USB is created from a live CD. Sometimes I run into the problem of the wireless card not working. Usually it is because I need the correct driver for that particular brand of wireless card. My current fix for this, is to build a USB with persistence, boot it up and compile the driver on the USB. I would like to make a USB more compatible with the different brands of wireless cards. Does anyone know of a way to compile the drivers before I burn the live CD?
Thanks,
13 years, 1 month
