0 Members and 1 Guest are viewing this topic.
--- orig_fll 2012-01-04 11:29:12.000000000 +0000+++ correction_image_name_image_dir_fll 2012-01-31 19:45:31.000000000 +0000@@ -981,10 +981,10 @@ FLL_SNAP_DEV=$(losetup -f) losetup ${FLL_SNAP_DEV} ${rootmnt}/fll/snapshot fi- FLL_ROOT_SIZE=$(ls -l "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_IMAGE_FILE}" | awk '{print $5}')+ FLL_ROOT_SIZE=$(ls -l "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_DM_IMAGE_FILE}" | awk '{print $5}') FLL_ROOT_DMSIZE=$((${FLL_ROOT_SIZE}/512)) FLL_IMAGE_DEV=$(losetup -f)- losetup ${FLL_IMAGE_DEV} "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_IMAGE_FILE}"+ losetup ${FLL_IMAGE_DEV} "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_DM_IMAGE_FILE}" FLL_DM_MAP="0 ${FLL_ROOT_DMSIZE} snapshot ${FLL_IMAGE_DEV} ${FLL_SNAP_DEV} P 8" dmsetup create ${FLL_DISTRO_NAME}-live --table "${FLL_DM_MAP}" mkdir -p "${rootmnt}/${FLL_MOUNTPOINT}"
--- orig_fll 2012-01-04 11:29:12.000000000 +0000+++ aufs_image_name_image_dir_fll 2012-02-01 10:25:46.000000000 +0000@@ -981,10 +981,10 @@ FLL_SNAP_DEV=$(losetup -f) losetup ${FLL_SNAP_DEV} ${rootmnt}/fll/snapshot fi- FLL_ROOT_SIZE=$(ls -l "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_IMAGE_FILE}" | awk '{print $5}')+ FLL_ROOT_SIZE=$(ls -l "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_DM_IMAGE_FILE}" | awk '{print $5}') FLL_ROOT_DMSIZE=$((${FLL_ROOT_SIZE}/512)) FLL_IMAGE_DEV=$(losetup -f)- losetup ${FLL_IMAGE_DEV} "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_IMAGE_FILE}"+ losetup ${FLL_IMAGE_DEV} "${rootmnt}/${FLL_MOUNTPOINT}.mnt/${FLL_DM_IMAGE_FILE}" FLL_DM_MAP="0 ${FLL_ROOT_DMSIZE} snapshot ${FLL_IMAGE_DEV} ${FLL_SNAP_DEV} P 8" dmsetup create ${FLL_DISTRO_NAME}-live --table "${FLL_DM_MAP}" mkdir -p "${rootmnt}/${FLL_MOUNTPOINT}"@@ -1011,9 +1011,16 @@ # prepare COW union filesystem # mkdir -p "${rootmnt}${FLL_UNION_MOUNTPOINT}" "${FLL_UNION_COWMNTPNT}${FLL_UNION_COWDIR}"- #- # union module specific options+ # if aufs required for dm style squashfs move and mount the ext4 file+ #+ if [ -e "${rootmnt}${FLL_MOUNTPOINT}/${FLL_DM_IMAGE_FILE}" ] ; then+ mkdir -p "${rootmnt}${FLL_MOUNTPOINT}.force_aufs/"+ mount -n -o move "${rootmnt}/${FLL_MOUNTPOINT}/" "${rootmnt}${FLL_MOUNTPOINT}.force_aufs/"+ mount -t ext4 "${rootmnt}${FLL_MOUNTPOINT}.force_aufs/${FLL_DM_IMAGE_FILE}" "${rootmnt}${FLL_MOUNTPOINT}"+ fi+ #+ # union module specific options # case "${FLL_UNION_MODULE}" in aufs)
siducer@siduction:~$ ls-auf-fs.rb Mount Point: /fll/aufs si Ident : si=ebebb4dc /fll/cow (rw) /fll/livedevp2/siduction11-1-kde/test32/h1 (ro) /fll/livedevp2/siduction11-1-kde/test32/h0 (ro) /fll/livedevp2/siduction11-1-kde/test32/99-usr-local-bin (ro) /fll/livedevp2/siduction11-1-kde/test32/8-git-gui-aufs-shwh (ro) /fll/livedevp2/siduction11-1-kde/test32/7-vlc-reinstall-youtube-mathomatic (ro) /fll/livedevp2/siduction11-1-kde/test32/6-adjust-prev-ffmpeg-etc (ro) /fll/livedevp2/siduction11-1-kde/test32/5-ug-programming-kdev-etc (ro) /fll/livedevp2/siduction11-1-kde/test32/4-libreoffice-with-dpkg (ro) /fll/livedevp2/siduction11-1-kde/test32/3-kidsgames-edu-extras (ro) /fll/livedevp2/siduction11-1-kde/test32/2-ug3-ruby-utils (ro) /fll/livedevp2/siduction11-1-kde/test32/1-ug2-synaptic-essent (ro) /fll/siduction (rr)siducer@siduction:~$
siducer@siduction:/fll/livedevp2/siduction11-1-kde/test32$ ls -ltotal 127964drwxr-xr-x 2 root root 4096 Feb 1 04:27 0lrwxrwxrwx 1 root root 22 Feb 1 03:27 1 -> 1-ug2-synaptic-essent/drwxr-xr-x 2 root root 4096 Jan 17 20:58 1.sqfs.dirdrwxr-xr-x 8 root root 4096 Jan 13 18:52 1-ug2-synaptic-essentlrwxrwxrwx 1 root root 17 Feb 1 03:27 2 -> 2-ug3-ruby-utils/drwxr-xr-x 9 root root 4096 Jan 13 20:13 2-ug3-ruby-utilslrwxrwxrwx 1 root root 23 Feb 1 03:27 3 -> 3-kidsgames-edu-extras/drwxr-xr-x 8 root root 4096 Jan 14 12:51 3-kidsgames-edu-extraslrwxrwxrwx 1 root root 24 Feb 1 03:28 4 -> 4-libreoffice-with-dpkg/drwxr-xr-x 8 root root 4096 Feb 1 03:27 4-libreoffice-with-dpkglrwxrwxrwx 1 root root 26 Feb 1 03:28 5 -> 5-ug-programming-kdev-etc/drwxr-xr-x 8 root root 4096 Feb 1 03:27 5-ug-programming-kdev-etclrwxrwxrwx 1 root root 25 Feb 1 03:28 6 -> 6-adjust-prev-ffmpeg-etc/drwxr-xr-x 8 root root 4096 Jan 25 04:32 6-adjust-prev-ffmpeg-etclrwxrwxrwx 1 root root 35 Feb 1 03:28 7 -> 7-vlc-reinstall-youtube-mathomatic/drwxr-xr-x 8 root root 4096 Jan 25 05:29 7-vlc-reinstall-youtube-mathomaticlrwxrwxrwx 1 root root 20 Feb 5 18:07 8 -> 8-git-gui-aufs-shwh/drwxr-xr-x 9 root root 4096 Feb 3 13:41 8-git-gui-aufs-shwhlrwxrwxrwx 1 root root 17 Feb 6 22:32 9 -> 9-joomla-2.5.0-1/lrwxrwxrwx 1 root root 17 Jan 30 04:33 99 -> 99-usr-local-bin/drwxr-xr-x 3 root root 4096 Feb 1 02:16 99-usr-local-bindrwxr-xr-x 4 root root 4096 Feb 6 22:28 9-joomla-2.5.0-1-rw-r--r-- 1 root root 109883392 Feb 7 02:55 9-joomla-2.5.0-1.sqfsdrwxr-xr-x 3 root root 4096 Jan 10 22:48 archiveslrwxrwxrwx 1 root root 19 Jan 12 20:37 base-mount -> ../../../siduction/drwxr-xr-x 3 root root 4096 Jan 27 22:50 chroot_scriptsetc...