2008-12-07 04:46:50 +01:00
|
|
|
#! /bin/bash
|
2008-09-07 03:39:35 +02:00
|
|
|
|
|
|
|
PKGLIST=""
|
|
|
|
QUIET="y"
|
|
|
|
FORCE="n"
|
2008-12-21 09:24:39 +01:00
|
|
|
PACCONFIG="/etc/pacman.conf"
|
2008-09-07 03:39:35 +02:00
|
|
|
|
|
|
|
APPNAME=$(basename "${0}")
|
|
|
|
|
|
|
|
# usage: usage <exitvalue>
|
|
|
|
usage ()
|
|
|
|
{
|
|
|
|
echo "usage ${APPNAME} [options] command <command options>"
|
|
|
|
echo " general options:"
|
|
|
|
echo " -f Force overwrite of working files/squashfs image/bootable image"
|
2008-10-20 02:51:48 +02:00
|
|
|
echo " -p PACKAGE(S) Additional package(s) to install, can be used multiple times"
|
2008-12-21 09:24:39 +01:00
|
|
|
echo " -C <file> Config file for pacman. Default $PACCONFIG"
|
2008-09-07 03:39:35 +02:00
|
|
|
echo " -v Enable verbose output."
|
|
|
|
echo " -h This message."
|
|
|
|
echo " commands:"
|
2008-12-07 04:46:50 +01:00
|
|
|
echo " create <dir>"
|
|
|
|
echo " create a base directory layout to work with"
|
|
|
|
echo " includes all specified packages"
|
|
|
|
echo " iso -p <bootloader> <dir> <image name>"
|
|
|
|
echo " build an iso image from the working dir"
|
|
|
|
echo " usb -p <bootloader> <dir> <image name>"
|
|
|
|
echo " build an iso image from the working dir"
|
2008-09-07 03:39:35 +02:00
|
|
|
exit $1
|
|
|
|
}
|
|
|
|
|
2009-07-26 10:40:59 +02:00
|
|
|
while getopts 'C:i:P:p:a:t:fvh' arg; do
|
2008-09-07 03:39:35 +02:00
|
|
|
case "${arg}" in
|
|
|
|
p) PKGLIST="${PKGLIST} ${OPTARG}" ;;
|
2008-12-21 09:24:39 +01:00
|
|
|
C) PACCONFIG="${OPTARG}" ;;
|
2008-09-07 03:39:35 +02:00
|
|
|
f) FORCE="y" ;;
|
|
|
|
v) QUIET="n" ;;
|
|
|
|
h|?) usage 0 ;;
|
|
|
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2008-10-21 06:40:43 +02:00
|
|
|
#trim spaces
|
|
|
|
PKGLIST="$(echo $PKGLIST)"
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
shift $(($OPTIND - 1))
|
|
|
|
|
|
|
|
# do UID checking here so someone can at least get usage instructions
|
|
|
|
if [ "$EUID" != "0" ]; then
|
|
|
|
echo "error: This script must be run as root."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2008-12-21 09:24:39 +01:00
|
|
|
if [ ! -f "$PACCONFIG" ]; then
|
|
|
|
echo "error: pacman config file '$PACCONFIG' does not exist"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
command_name="${1}"
|
2008-10-19 22:49:55 +02:00
|
|
|
work_dir=""
|
|
|
|
imgname=""
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
case "${command_name}" in
|
2008-12-07 04:46:50 +01:00
|
|
|
create) work_dir="${2}"; imgname="none" ;;
|
|
|
|
iso) work_dir="${2}"; imgname="${3}" ;;
|
|
|
|
usb) work_dir="${2}"; imgname="${3}" ;;
|
2008-09-07 03:39:35 +02:00
|
|
|
*) echo "invalid command name '${command_name}'"; usage 1 ;;
|
|
|
|
esac
|
|
|
|
|
2008-12-19 05:08:38 +01:00
|
|
|
[ "x${imgname}" = "x" ] && echo "Image name must be specified" && usage 1
|
|
|
|
[ "x${work_dir}" = "x" ] && echo "Please specify a working directory" && usage 1
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-10-20 02:54:18 +02:00
|
|
|
echo "${APPNAME} : Configuration Settings"
|
|
|
|
echo " working directory: ${work_dir}"
|
|
|
|
echo " image name: ${imgname}"
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
# usage: _pacman <packages>...
|
|
|
|
_pacman ()
|
|
|
|
{
|
|
|
|
local ret
|
|
|
|
if [ "${QUIET}" = "y" ]; then
|
2008-12-21 09:24:39 +01:00
|
|
|
mkarchroot -C "$PACCONFIG" -f "${work_dir}/root-image" $* 2>&1 >/dev/null
|
2008-09-07 03:39:35 +02:00
|
|
|
ret=$?
|
|
|
|
else
|
2008-12-21 09:24:39 +01:00
|
|
|
mkarchroot -C "$PACCONFIG" -f "${work_dir}/root-image" $*
|
2008-09-07 03:39:35 +02:00
|
|
|
ret=$?
|
|
|
|
fi
|
2008-10-19 22:49:55 +02:00
|
|
|
|
|
|
|
# Cleanup
|
|
|
|
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
if [ $ret -ne 0 ]; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
command_create () {
|
|
|
|
echo "====> Creating working directory: ${work_dir}"
|
|
|
|
mkdir -p "${work_dir}/iso/"
|
|
|
|
mkdir -p "${work_dir}/root-image/"
|
|
|
|
echo "# archiso isomounts file
|
|
|
|
# img - location of image/directory to mount relative to addons directory
|
|
|
|
# arch - architecture of this image
|
|
|
|
# mount point - absolute location on the post-initrd root
|
|
|
|
# type - either 'bind' or 'squashfs' for now
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
# syntax: <img> <arch> <mount point> <type>
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-23 07:52:18 +01:00
|
|
|
# NOTE: Order matters. If the same file exists in multiple
|
|
|
|
# images, the FIRST one mounted, top-down, will take precedence
|
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
root-image.sqfs i686 / squashfs
|
|
|
|
#root-image-x86_64.sqfs x86_64 / squashfs" > "${work_dir}/isomounts"
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
echo "README for this archiso created directory
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
All directories in this dir, except for 'iso' will be squashed
|
|
|
|
with squashfs and put into the iso dir as iso/<dirname>.sqfs
|
|
|
|
This should be reflected in the isomounts file
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
The iso dir is later used to build the actual bootable iso.
|
2008-12-20 06:24:18 +01:00
|
|
|
Please ensure the proper bootloader is installed or copied
|
|
|
|
to the iso/ directory.
|
2008-12-23 07:52:18 +01:00
|
|
|
|
|
|
|
...TODO: Write more..." > "${work_dir}/README"
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
if [ "${PKGLIST}" != "" ]; then
|
|
|
|
echo "====> Installing packages to '${work_dir}/root-image/'"
|
|
|
|
_pacman "${PKGLIST}"
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
echo "Cleaning up what we can"
|
|
|
|
if [ -d "${work_dir}/root-image/boot/" ]; then
|
|
|
|
# remove the initcpio images that were generated for the host system
|
2009-01-25 00:43:21 +01:00
|
|
|
find "${work_dir}/root-image/boot" -name '*.img' -delete
|
2008-09-07 03:39:35 +02:00
|
|
|
fi
|
|
|
|
|
2008-12-07 04:46:50 +01:00
|
|
|
#TODO is this needed? do it at the Makefile level?
|
|
|
|
if [ -d "${work_dir}/root-image/home/" ]; then
|
|
|
|
echo "Creating default home directory"
|
|
|
|
install -d -o1000 -g100 -m0755 "${work_dir}/root-image/home/arch"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# delete a lot of unnecessary cache/log files
|
|
|
|
kill_dirs="var/abs var/cache/man var/cache/pacman var/lib/pacman/sync var/log/* var/mail tmp/* initrd"
|
|
|
|
for x in ${kill_dirs}; do
|
|
|
|
if [ -e "${work_dir}/root-image/${x}" ]; then
|
|
|
|
rm -rf "${work_dir}/root-image/${x}"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
2008-09-14 06:18:10 +02:00
|
|
|
}
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-19 05:08:38 +01:00
|
|
|
# _mksquash dirname
|
|
|
|
_mksquash () {
|
|
|
|
if [ ! -d "$1" ]; then
|
|
|
|
echo "Error: '$1' is not a directory"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
sqimg="${work_dir}/iso/$(basename ${1}).sqfs"
|
|
|
|
echo "====> Generating SquashFS image for '${1}'"
|
|
|
|
if [ -e "${sqimg}" ]; then
|
2009-11-10 01:31:29 +01:00
|
|
|
dirhaschanged=$(find ${1} -newer ${sqimg})
|
|
|
|
if [ "${dirhaschanged}" != "" ]; then
|
|
|
|
echo "SquashFS image '${sqimg}' is not up to date, rebuilding..."
|
2008-12-19 05:08:38 +01:00
|
|
|
rm "${sqimg}"
|
2008-09-07 03:39:35 +02:00
|
|
|
else
|
2009-11-10 01:31:29 +01:00
|
|
|
echo "SquashFS image '${sqimg}' is up to date, skipping."
|
|
|
|
return
|
2008-09-07 03:39:35 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2008-10-19 22:49:55 +02:00
|
|
|
echo "Creating SquashFS image. This may take some time..."
|
2008-09-07 03:39:35 +02:00
|
|
|
start=$(date +%s)
|
|
|
|
if [ "${QUIET}" = "y" ]; then
|
2008-12-19 05:08:38 +01:00
|
|
|
mksquashfs "${1}" "${sqimg}" -noappend >/dev/null
|
2008-09-07 03:39:35 +02:00
|
|
|
else
|
2008-12-19 05:08:38 +01:00
|
|
|
mksquashfs "${1}" "${sqimg}" -noappend
|
2008-09-07 03:39:35 +02:00
|
|
|
fi
|
|
|
|
minutes=$(echo $start $(date +%s) | awk '{ printf "%0.2f",($2-$1)/60 }')
|
|
|
|
echo "Image creation done in $minutes minutes."
|
2008-09-14 06:18:10 +02:00
|
|
|
}
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-19 05:08:38 +01:00
|
|
|
_imgcommon () {
|
|
|
|
for d in $(find "${work_dir}" -maxdepth 1 -type d -name '[^.]*'); do
|
|
|
|
if [ "$d" != "${work_dir}/iso" -a \
|
|
|
|
"$(basename "$d")" != "iso" -a \
|
|
|
|
"$d" != "${work_dir}" ]; then
|
|
|
|
_mksquash "$d"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
echo "====> Making bootable image"
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# Sanity checks
|
|
|
|
if [ ! -d "${work_dir}/iso" ]; then
|
|
|
|
echo "Error: '${work_dir}/iso' doesn't exist. What did you do?!"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ! -f "${work_dir}/isomounts" ]; then
|
|
|
|
echo "Error: the isomounts file doesn't exist. This image won't do anything"
|
|
|
|
echo " Protecting you from yourself and erroring out here..."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2008-09-07 03:39:35 +02:00
|
|
|
if [ -e "${imgname}" ]; then
|
|
|
|
if [ "${FORCE}" = "y" ]; then
|
|
|
|
echo "Removing existing bootable image..."
|
|
|
|
rm -rf "${imgname}"
|
|
|
|
else
|
|
|
|
echo "error: Image '${imgname}' already exists, aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2008-12-19 05:08:38 +01:00
|
|
|
cp "${work_dir}/isomounts" "${work_dir}/iso/"
|
2009-07-26 11:00:44 +02:00
|
|
|
|
|
|
|
export LABEL="ARCHISO_$(pwgen -n 8 1 | tr [a-z] [A-Z])"
|
|
|
|
[ -f ${work_dir}/iso/boot/grub/menu.lst ] && sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/grub/menu.lst
|
|
|
|
[ -f ${work_dir}/iso/boot/isolinux/isolinux.cfg ] && sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg
|
2008-12-19 05:08:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
command_iso () {
|
|
|
|
_imgcommon
|
2008-10-20 06:18:16 +02:00
|
|
|
|
2008-10-19 22:49:55 +02:00
|
|
|
bootflags=""
|
2008-12-20 06:30:53 +01:00
|
|
|
if [ "$PKGLIST" = "grub" -o "$PKGLIST" = "grub-gfx" ]; then
|
2008-12-19 05:08:38 +01:00
|
|
|
if [ ! -e "${work_dir}/iso/boot/grub/stage2_eltorito" ]; then
|
|
|
|
echo "error: grub stage files not found in '${work_dir}/iso/boot/grub'"
|
2008-10-25 08:32:12 +02:00
|
|
|
exit 1
|
|
|
|
fi
|
2008-10-21 06:41:05 +02:00
|
|
|
|
|
|
|
bootflags="-b boot/grub/stage2_eltorito"
|
2008-12-20 06:26:45 +01:00
|
|
|
elif [ "$PKGLIST" = "syslinux" ]; then
|
2008-12-19 05:08:38 +01:00
|
|
|
if [ ! -e "${work_dir}/iso/boot/isolinux/isolinux.bin" ]; then
|
|
|
|
echo "error: isolinux bin file not found in '${work_dir}/iso/boot/isolinux'"
|
2008-10-25 08:32:12 +02:00
|
|
|
exit 1
|
|
|
|
fi
|
2008-10-21 06:41:05 +02:00
|
|
|
|
|
|
|
bootflags="-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
|
2008-10-19 22:49:55 +02:00
|
|
|
else
|
2008-10-21 06:41:05 +02:00
|
|
|
echo "No bootloader specified. Use the -p flag to specify"
|
|
|
|
echo " Supported Bootloaders:"
|
|
|
|
echo " grub"
|
2008-12-20 06:30:53 +01:00
|
|
|
echo " grub-gfx"
|
2008-12-20 06:26:45 +01:00
|
|
|
echo " syslinux"
|
2008-10-21 06:41:05 +02:00
|
|
|
exit 1
|
2008-10-19 22:49:55 +02:00
|
|
|
fi
|
2008-09-07 03:39:35 +02:00
|
|
|
|
2008-12-19 05:08:38 +01:00
|
|
|
echo "Creating ISO image..."
|
|
|
|
qflag=""
|
2009-06-29 19:34:02 +02:00
|
|
|
[ "${QUIET}" = "y" ] && qflag="-quiet"
|
2008-12-19 05:08:38 +01:00
|
|
|
mkisofs ${qflag} -r -l $bootflags -uid 0 -gid 0 \
|
|
|
|
-input-charset utf-8 -p "prepared by mkarchiso" \
|
|
|
|
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
2009-01-26 02:37:25 +01:00
|
|
|
-publisher "Arch Linux <http://www.archlinux.org>" \
|
|
|
|
-A "Arch Linux Live/Rescue CD" \
|
2009-07-26 11:00:44 +02:00
|
|
|
-V "${LABEL}" \
|
2008-12-19 05:08:38 +01:00
|
|
|
-o "${imgname}" "${work_dir}/iso/"
|
|
|
|
}
|
|
|
|
|
|
|
|
command_usb () {
|
|
|
|
_imgcommon
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
|
|
|
|
modprobe -q loop
|
|
|
|
|
|
|
|
# Calculate cylinder size in bytes
|
|
|
|
CYL_SIZE=$((255*63*512))
|
|
|
|
|
|
|
|
# First partition offset
|
|
|
|
PART_OFFSET=$((63*512))
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# ext2 overhead's upper bound is 6%, empirically tested up to 1GB
|
2008-12-24 19:33:36 +01:00
|
|
|
rootsize=$(du -bs "${work_dir}/iso" | cut -f1)
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
imgsz=$(( (${rootsize}*106)/100/${CYL_SIZE} + 1 )) # image size in cylinders
|
|
|
|
|
|
|
|
# Get next free loop device
|
|
|
|
devloop=$(losetup -f)
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# create the filesystem image file
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
dd if=/dev/zero of="$imgname" bs="$CYL_SIZE" count="$imgsz"
|
|
|
|
|
|
|
|
# Setup a loop device, and skip the first 63 sectors
|
|
|
|
losetup "$devloop" -o "$PART_OFFSET" "$imgname"
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# create a filesystem on the image
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
mke2fs -m 0 -F -L "${LABEL}" "$devloop"
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# mount the filesystem and copy data
|
|
|
|
TMPDIR=$(mktemp -d archiso-usbXXXXXX)
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
mount "$devloop" "$TMPDIR"
|
2008-12-19 05:08:38 +01:00
|
|
|
cp -a "${work_dir}"/iso/* "$TMPDIR"
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
umount -d "$TMPDIR"
|
2008-12-23 09:33:46 +01:00
|
|
|
rm -rf "$TMPDIR"
|
2008-12-19 05:08:38 +01:00
|
|
|
|
|
|
|
# create a partition table
|
Fix how mkarchiso makes usb image
The current implementation in how partition is created for ext2 img
it looks a bit bad.
This patch makes the partition in more standarized way, respecting
cylinder alignement:
* The size of resulting image will be in cylinder multiple ~8MB.
* Use fdisk instead of sfdisk (sfdisk write some bad information)
* Make the result image in one pass, instead of concatenating.
Also the advantage is that with this can add another partitions
without any issues in the usb-flash-drive with this .img.
For example of current situation:
qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 223 MB, 223974400 bytes
59 heads, 41 sectors/track, 180 cylinders
Units = cylinders of 2419 * 512 = 1238528 bytes
Disk identifier: 0x00000000
Device Boot Start End Blocks Id System
/dev/sda1 * 1 181 218693+ 83 Linux
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Command (m for help): v
Partition 1 has different physical/logical beginnings (non-Linux?):
phys=(0, 1, 1) logical=(0, 1, 23)
Partition 1 has different physical/logical endings:
phys=(27, 58, 41) logical=(180, 49, 21)
Partition 1: previous sectors 437449 disagrees with total 67731
62 unallocated 512-byte sectors
Command (m for help):
---------------------------------------------------------------------
qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio
---------------------------------------------------------------------
[root@avr ~]# fdisk /dev/sda
Command (m for help): p
Disk /dev/sda: 230 MB, 230307840 bytes
255 heads, 63 sectors/track, 28 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x5c94ca4f
Device Boot Start End Blocks Id System
/dev/sda1 * 1 28 224878+ 83 Linux
Command (m for help): v
62 unallocated 512-byte sectors
---------------------------------------------------------------------
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21 05:21:58 +02:00
|
|
|
fdisk -C "$imgsz" -H 255 -S 63 "$imgname" << EOF
|
|
|
|
n
|
|
|
|
p
|
|
|
|
1
|
|
|
|
|
|
|
|
|
|
|
|
a
|
|
|
|
1
|
|
|
|
p
|
|
|
|
w
|
2008-12-19 05:08:38 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
# install grub on the image
|
|
|
|
grub --no-floppy --batch << EOF
|
2008-12-23 09:23:22 +01:00
|
|
|
device (hd0) ${imgname}
|
|
|
|
root (hd0,0)
|
|
|
|
setup (hd0)
|
2008-12-19 05:08:38 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-09-14 06:18:10 +02:00
|
|
|
# Go through the main commands in order. If 'all' was specified, then we want
|
|
|
|
# to do everything. Start with 'install'.
|
2008-12-19 05:08:38 +01:00
|
|
|
if [ "${command_name}" = "create" ]; then
|
|
|
|
command_create
|
2008-09-14 06:18:10 +02:00
|
|
|
fi
|
2008-12-19 05:08:38 +01:00
|
|
|
if [ "${command_name}" = "iso" ]; then
|
|
|
|
command_iso
|
2008-09-14 06:18:10 +02:00
|
|
|
fi
|
2008-12-19 05:08:38 +01:00
|
|
|
if [ "${command_name}" = "usb" ]; then
|
|
|
|
command_usb
|
2008-09-07 03:39:35 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
# vim:ts=4:sw=4:et:
|