Commit Graph

274 Commits

Author SHA1 Message Date
Thomas Bächler
1a59eb3792 Add the verify=y option to verify the squashfs signature with gpg 2016-02-28 17:09:08 -03:00
Thomas Bächler
249a52d941 Add gpg to the image and optionally create a keyring
If the ARCHISO_GNUPG_FD environment variable is set, its contents will be interpreted as an open file
descriptor and its contents will be used to create a keyring in the initramfs in /gpg.
2016-02-28 17:09:08 -03:00
Christian Hesse
5725183716 fix boot parameters for mount options
Fixes: 03c296cb4f
Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-04 23:13:28 -03:00
Christian Hesse
03c296cb4f add boot params archisoflags= and cow_flags= for mount options
Having files on btrfs subvolumes requires to give mount options. Add
boot params archisoflags= and cow_flags= for this purpose. Boot
parameters could look like this:

... archisodevice=/dev/sdaX archisoflags=subvolume=isos
cow_device=/dev/sdaX cow_flags=subvolume=persist ...

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-12-13 12:21:43 -03:00
Gerardo Exequiel Pozzi
c1e475bf18 [archiso] mkarchiso: Switch to overlayfs by default
If old behaviour is needed use "... -s sfs prepare".

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2015-09-28 19:36:58 -03:00
Adam Purkrt
d35d87f252 cleaner boot from loopmounted iso file
Currently, when booting loopmounted iso file, it is necessary to
specify not only img_dev and img_loop (which should be sufficient),
but also archisolabel or archisodevice. With this patch, archisodevice
is directly populated with the correct loop device, and it is not
necessary to specify the label when booting from loopmounted iso,
which makes for leaner and cleaner grub.cfg.
2015-09-13 14:45:20 -03:00
Christian Hesse
f21da59e81 flush ip addresses after copy to RAM
We received an IP address from DHCP server and configure it statically.
This is required if we continue to use network connectivity to access
the root device (for example via NBD or NFS).

The lease is not updated, though. This can cause trouble in networks
with low lease times. So let's flush the addresses if root filesystem
has been copied to RAM. A dhcp client in main system can handle the
network connectivity then.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-06-24 21:52:40 -03:00
Christian Hesse
dc845b3f13 limit access to cow directory
Signed-off-by: Christian Hesse <mail@eworm.de>
2015-05-29 17:03:10 -03:00
Christian Hesse
b1a397e98d launch interactive shell if ipconfig fails
Signed-off-by: Christian Hesse <mail@eworm.de>
2015-05-29 13:10:42 -03:00
Christian Hesse
b1011376cf explicitly detach loop device on umount and silent losetup error
Umount detaches the loop device automatically, but let's make it
explicit to be sure. Additionally losetup gives:

losetup: /dev/loop0: detach failed: No such device or address

This is kind of expected, let's silent the error message.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-05-29 13:10:37 -03:00
Christian Hesse
dced05a847 explicitly detach loop device on umount
I see cases where a stale loop device stays around and fills up my
partition as image file is still in use and does not get unlinked.

Explicitly detach loop device on umount to fix that.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-04-21 19:24:30 -03:00
Gerardo Exequiel Pozzi
9322a0d3b7 [archiso] Rename cowfile_size to cow_spacesize=
The name is more relevant since the usage is shared for both
dm-snapshot and overlayfs.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2015-01-27 14:37:05 -03:00
Gerardo Exequiel Pozzi
a637bdb857 [archiso] Add optional OverlayFS support
This is the first attemp to test overlayfs in archiso.
The current dm-snapshot mode is keep and is enabled by default,
while the new mode is enabled via "-s sfs" to mkarchiso.
No new boot parameters are added, since archiso hooks detects
if the .sfs file is for dm-snapshot (airootfs.img inside)
or for overlayfs.
Persistence is supported in overlayfs mode using the same options
(cowlabel or cowdevice), but warning while in dm-snapshot mode,
only one file is used (airootfs.cow), in overlayfs mode internal
files for workdir/ and upperdir/ are allocated, so you can not use
VFAT or NTFS.

To test this, you need to enable [testing] in pacman.conf from
releng profile and edit build.sh then add "-s sfs" in make_prepare()

Look at:
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
Replace with:
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -s sfs -D "${install_dir}" prepare

The build requires just half of space that the build for dm-snapshot,
since there is no ext4 img ;)

Just to remember: there is no space gain in .sfs (just about 2M)

There is at least one thing during boot with machine-id service:
Dec 24 03:31:39 archiso systemd-machine-id-commit[183]: Failed to unmount transient /etc/machine-id file in our private namespace: Invalid argument

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2015-01-27 14:37:05 -03:00
Christian Hesse
156b9a6093 allow to change dm snapshot chunksize
Copying big amount of data results in bad performance as data is
written in chunks of 4kiB (8 * 512 bytes).

The default is not changed but can be overwritten.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-01-02 15:13:36 -03:00
Christian Hesse
0b7a77cfc3 use consistent syntax for boot parameter processing
Signed-off-by: Christian Hesse <mail@eworm.de>
2015-01-02 15:13:35 -03:00
Gerardo Exequiel Pozzi
f5518de732 [archiso] Merge cowspace_size= option in cowfile_size=
Since now cowspace_size == cowfile_size (only one file inside)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2014-12-13 16:53:06 -03:00
Gerardo Exequiel Pozzi
edfdd37ba0 [archiso] Change cowfile_size= behavior
Move from percent to explicit size and set a default of 256M (sparse)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2014-10-13 21:15:22 -03:00
Gerardo Exequiel Pozzi
9f88990065 [archiso] Disable ext4 resize_inode on airootfs.
Remove unused feature, just to save space
sizeof ext4 image (empty): 4.3M vs 403K (du airootfs.img)
sizeof used space (empty):  48M vs  20K (df)

Thanks Christian Hesse for initial tip.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2014-08-22 20:10:10 -03:00
Lukas Fleischer
f5b84dad94 archiso_pxe_http: Fix location of airootfs.md5
Currently, when booting via HTTP, the airootfs.md5 file is downloaded to
/run/archiso/bootmnt/arch/. However, the checksum file is later assumed
to be located at "/run/archiso/bootmnt/arch/${arch}". Fix the _curl_get
invocation and directly place the file in the right directory.

Fixes a regression introduced in commit b3e1d31 ([archiso] Rework
checksum function, 2014-06-28).

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
2014-08-12 19:32:31 -03:00
Lukas Fleischer
5a8a8c7b10 Reintroduce the possibility to force an architecture
Among other things, 36459f3 ([archiso] Drop aitab support, 2014-06-28)
removed the possibility to manually set a specific architecture by using
kernel parameters. This, however, is useful, e.g. when installing Arch
Linux on a device that reports itself as i586 but works fine with the
i686 flavor.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
2014-08-08 13:37:30 -03:00
Gerardo Exequiel Pozzi
eea299fa19 [archiso] Remove workwaround for nls/vfat
The proper fix in now in mkinitcpio-18

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2014-07-26 17:26:16 -03:00
Gerardo Exequiel Pozzi
b3e1d31343 [archiso] Rework checksum function 2014-06-28 00:35:51 -03:00
Gerardo Exequiel Pozzi
4890ce0b67 [archiso] _chroot_init() remove "already runned" logic
This is done better with run_once() in build.sh
2014-06-28 00:35:51 -03:00
Gerardo Exequiel Pozzi
12286e2712 [archiso] command_install() remove "already executed" logic
This is done better with run_once() in build.sh
2014-06-28 00:35:51 -03:00
Gerardo Exequiel Pozzi
9532a8c3a9 [archiso] Minor change 2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
bdc79f2d26 [archiso] Remove _is_directory_changed()
This is a task done in some way by run_once() on build.sh
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
539c38663c [archiso] Rework _mount_fs() to _mount_airootfs() same for umount
Also remove _show_space_usage() irrelevant now when fs size is fixed and big
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
25e39ee081 [archiso] Merge _mkfs() and _mksfs() in _mkairootfs() 2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
ba40f273f6 [archiso] rename airootfs.fs.sfs to airootfs.sfs
* Make it ISO9660 friendly (extra dot "." is replaced by "_")
* Was used when support both .fs.sfs and .sfs
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
36459f3acc [archiso] Drop aitab support
Always create one filesystem of a fixed size (32G), format (ext4) and
know name "airootfs".

Simplify logic a lot.
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
9131f83404 [archiso] mkarchiso: Add -c switch to specify squashfs compression type. 2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
c62a9d748b [archiso] Always use a 32GiB filesystem size for airootfs
There is no big overhead.
Space usage in ext4-1G is ~0.4M while in ext4-32G is ~4M.
Just use a big value to make all people happy.
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
b9833ce4f8 [archiso] mkarchiso: Only use ext4 as filesystem for airootfs 2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
604b182af5 [archiso] Rename root-image to airootfs
Two purposes:
 * systemd filename friendly: "-" is used for "/" and must be escaped with "\x20"
 * ISO9660 filename friendly: "-" is replaced with "_"
2014-06-28 00:35:50 -03:00
Gerardo Exequiel Pozzi
4f4af3df6e [archiso] Add nls_iso8859-1 to initramfs.
Fix FS#40217

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2014-05-21 20:45:29 -03:00
Gerardo Exequiel Pozzi
c2b6209532 [archiso] mkarchiso: init cmd: test for file instead of directory
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2013-10-02 19:37:39 -03:00
Gerardo Exequiel Pozzi
997dabbce2 [archiso] mkarchiso: use arch-install-scripts instead of own functions
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2013-09-21 18:11:43 -03:00
Gerardo Exequiel Pozzi
c5539c799c [configs/releng] explicit set 'Storage=volatile' for journald
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2013-09-21 16:53:45 -03:00
Gerardo Exequiel Pozzi
f19f6173c8 [archiso] Add support to isohybrid-gpt for EFI boot
Tested and works fine under qemu using seabios and ovmf

$ qemu-system-x86_64 -enable-kvm -drive file=~/archlinux-2013.06.20-dual.iso
$ qemu-system-x86_64 -enable-kvm -drive file=~/archlinux-2013.06.20-dual.iso,media=cdrom
$ qemu-system-x86_64 -enable-kvm -bios ~/arch/OVMF/bios.bin -drive file=~/archlinux-2013.06.20-dual.iso
$ qemu-system-x86_64 -enable-kvm -bios ~/arch/OVMF/bios.bin -drive file=~/archlinux-2013.06.20-dual.iso,media=cdrom

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2013-06-20 18:48:41 -03:00
Gerardo Exequiel Pozzi
21b6a908c3 [archiso] Fix find cmd in _cleanup()
Fix FS#34075

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2013-03-03 18:23:57 -03:00
Gerardo Exequiel Pozzi
00d1126f70 [archiso] Avoid integer overflow when .fs is > 10.2G 2013-01-08 20:20:03 -03:00
Gerardo Exequiel Pozzi
89fe9b78ae [archiso] mkarchiso: Cleanup kernel(s) in /boot
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-12-16 20:12:11 -03:00
Gerardo Exequiel Pozzi
e6409b6061 [archiso] mkarchiso: do not process aitab entry if arch differs
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-12-16 18:06:04 -03:00
Gerardo Exequiel Pozzi
9de7abfc19 [archiso] mkarchiso: Disable lazy_itable_init (ext4)
Ensure that all inode table is initialized at filesystem creation.
(Anyway filesystem is small, so at first mount is may quickly initialized)

This avoid possible COW usage during runtime ;)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-12-10 12:06:19 -03:00
Gerardo Exequiel Pozzi
f4ecca25b7 [archiso] mkarchiso: Use truncate instead of dd
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-12-10 12:06:19 -03:00
Gerardo Exequiel Pozzi
a79559c897 [archiso] Avoid journald log to /var/log/journal
This was recently enabled in [systemd] package.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-10-24 13:18:17 -03:00
Gerardo Exequiel Pozzi
aece3e3d2e [archiso] Remove uneeded cleanup /tmp
/tmp is mounted as tmpfs since archiso implements own chroot code.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-10-24 13:18:16 -03:00
Gerardo Exequiel Pozzi
594fc08b29 [archiso] Remove old code (now redundant)
/etc/mtab symlink is part of [filesystem] since long time

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-10-24 13:18:16 -03:00
Gerardo Exequiel Pozzi
21aa378007 [archiso] Allow set copytoram=n for NBD/NFS
On low memory systems installing via PXE is not possible.
Do not force copytoram=y for NFS/NDB.
Broken/hang things:
* On shutdown.
* On run-time if some network settings changed.

Implements FS#32006.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-10-16 19:10:17 -03:00
Gerardo Exequiel Pozzi
1746e31049 [archiso] Introduce cowfile_size= bootparam
If not set, nothing is changed in current behaviour.

Since dm-snapshot allows to use as "COW" a file with any size,
without caring about the the size of "origin", we can avoid creating a
"COW" file of the same size as the "origin". This is really useful,
when using as cow_device= a filesystem that is VFAT where sparse files
are not supported, so if root-image.fs is 1000M, passing cowfile_size=25%
will create a root-image.cow of 250M instead of 1000M.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-10-13 14:40:41 -03:00