Commit Graph

42 Commits

Author SHA1 Message Date
Sven-Hendrik Haase
f77ddc0e9c Removed pwgen dependency 2009-11-30 15:14:09 -08:00
Sven-Hendrik Haase
ca52931e3a mkarchiso: cleaned up to use isohybrid only 2009-11-30 13:15:33 -08:00
Sven-Hendrik Haase
961d4cb670 mkarchiso: cleanup opts, user dir creation
As in title, this patch cleans up opt flags that exist for no reason and
adds additional flags to modify the disk meta info which would otherwise
be hardcoded.

I wasn't quite sure about the user directory part but it doesn't seem
like a good idea to put that part into the script and therefore I
commented it out. It would probably interfere with rc.local scripts that
take care of skel copying. I replaced the part after the TODO with a
safe guard to make sure that people who are not aware of the changes
will not be caught by surprise.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-11-23 12:51:13 -08:00
Gerardo Exequiel Pozzi
ce2242da7e Silent modprobe loop loading in mkarchiso
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-19 03:37:29 -03:00
Gerardo Exequiel Pozzi
f32a5c5b20 Avoid force/rebuild of squashfs images if already updated.
Check if there are any modification of files/directories inside
the target directory for squashfs image.

Implements in some way this item in TODO:
* Add 'needsupdate' function to check if a squashfs image in the
  iso dir is up to date, if so, skip it; else rebuild it. No more
  need for the -f flag

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-09 21:41:13 -03:00
Gerardo Exequiel Pozzi
db1dde541c 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 00:46:39 -03:00
Gerhard Brauer
8d57752ced Use a label when generating the image and pass it to the commandline
This will generate a label ARCHISO_$randomstring using the pwgen
utility and add this label to the kernel command line.
A new label will be generated for each image, so it can be uniquely
identified.
Patch from brain0 <thomas@archlinux.org>

Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-07-27 11:03:38 -07:00
Gerhard Brauer
73dc6b4b1b Enabled -C option in mkarchiso
This flag allows to specify a own pacman.conf using during mkarchiso.

Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-07-27 11:03:38 -07:00
Gerhard Brauer
d49b3da829 Fix mkisofs quiet parameter
Option syntax for quiet mode in mkisofs has changed

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-29 10:34:02 -07:00
Loui Chang
7a98a216de Fix typos, formatting, and vague language where possible.
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
[Fixed menu.lst: LiveCD -> Live CD -aaron]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-26 22:10:09 -06:00
Aaron Griffin
c6bb213064 Single quotes around find patterns during cleanup
Whoops, *.img expands if we're building USB images.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-24 17:43:21 -06:00
Aaron Griffin
4dc9b68e4d Remove a stray '_mksquash' echo
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24 10:45:05 -08:00
Aaron Griffin
fbd2ce5cb0 Fix usb image's size detection
Conversion issue when dropping mkusbimg. Use work_dir/iso
to get the proper image size

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24 10:33:36 -08:00
Aaron Griffin
32a1991679 Properly remove the usb image's tmpdir
Guess what? rm -f won't remove a dir. Whoops

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 00:33:46 -08:00
Aaron Griffin
f47fde8485 Fix some intending errors in USB creation
This was causing sfdisk and grub to balk

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 02:23:22 -06:00
Aaron Griffin
2a58a09f8c README and isomounts additions on creation
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 00:52:18 -06:00
Aaron Griffin
978fdafbff Allow specifying of pacman.conf file in mkarchiso
Use the -C flag to allow us to build alternate isos on
a different architecture and things of the sort

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-21 02:24:39 -06:00
Aaron Griffin
97f4dcec81 Re-add the if-check that includes grub-gfx
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:30:53 -06:00
Aaron Griffin
485838e9a9 Remove host system package checks
Not needed as we ensure files are in the ISO dir

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:26:45 -06:00
Aaron Griffin
a3fc771d90 Add bootloader requirements to the README
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:24:18 -06:00
Aaron Griffin
4e638eaf24 Final changes for new nextgen scripts
Too much to list. Just look at the diff 8)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:19 -06:00
Aaron Griffin
fe517fb0fc Fix isolinux support (pkgname)
Package name is 'syslinux'

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:18 -06:00
Aaron Griffin
f918440da1 Rework the commands, create and iso
Initial changes to get 'create' working as intended.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:17 -06:00
Aaron Griffin
ee900303ae Move grub/isolinux stuff to Makefile level
Again, in an attempt to make this feel cleaner, I've moved
more out to the makefile level. Not sure I'm happy with that
but it works for now

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 01:32:12 -05:00
Aaron Griffin
071b3454a0 Rework image creation
Allow for grub, grub-gfx, or isolinux support
(isolinux support still pending, skeleton is in place)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:41:05 -05:00
Aaron Griffin
c8df7387dd Trim spaces from the package list before using
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:40:43 -05:00
Aaron Griffin
d8f4565b89 Minor modifications to usage output
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:40:17 -05:00
Aaron Griffin
3f5c116d8c Enable mkinitcpio hook to use the 'mounts' file
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:39:43 -05:00
Aaron Griffin
2b6515271d Remove mkinitcpio functionality
We don't want to tie the archiso scripts to the way the ISO
should boot the live system. This can and should be done at
the build (Makefile) level beforehand

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:31:50 -05:00
Aaron Griffin
f3110a21eb Move mountfile copying code
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:18:16 -05:00
Aaron Griffin
eb6693901d Rename 'img' command to 'image'
Additionally, remove the "all" command

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:08:34 -05:00
Aaron Griffin
bba27fbe4a Default IMG_TYPE to 'iso'
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:06:35 -05:00
Aaron Griffin
b4d60a7ccb Fail install if no packages specified
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:40:36 -05:00
Aaron Griffin
61d0a83113 Code cleanup: usage and comments
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:40:06 -05:00
Aaron Griffin
6989ceb442 Minor documentation updates
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:39:35 -05:00
Aaron Griffin
e7a7902104 Add some config output on calling mkarchiso
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 19:57:09 -05:00
Aaron Griffin
00848934b6 Remove all 'package file' usage in favor of command line packages
This is just simpler and more intuitive. Shell tools can easily
be used to install from a file. For instance:
   $ mkarciso ... -p "$(cat package-file)"

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 19:51:48 -05:00
Aaron Griffin
c2ffda39f9 Rename all uses of 'archlive' to 'archiso'
Additionally change grub prompts to use "ArchLinux LiveCD"
as the boot item name

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 15:49:55 -05:00
Aaron Griffin
f3c061b541 Capitalize "global" variables IMGROOT and INSTROOT
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-13 23:20:47 -05:00
Aaron Griffin
b7d7a9fcdf Refactor commands out into functions (for the future)
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-13 23:18:10 -05:00
Aaron Griffin
98318ea039 Rename "default-config" to "overlay"
I like difficulty and then name was annoying me

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 20:45:45 -05:00
Aaron Griffin
8966351b12 Split mkarchiso and configs into logical parts
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 20:39:35 -05:00