Commit Graph

120 Commits

Author SHA1 Message Date
David Runge
5e43a63b3c
Fixing issues with variable quoting and arrays
archiso/mkarchiso:
Calls to _pacman() need to be done with multiple parameters (e.g. array) instead of one string, as string splitting is
not done in that function anymore.
Turning _iso_efi_boot_args from string into an array to have an easier time of passing it to xorriso.
Calling xorriso within the if statements instead of providing -quiet via variable.
Fixing command_install() to provide packages separately to _pacman()

configs/releng/build.sh:
Replacing all newlines when retrieving the packages from packages.x86_64 with spaces so they will be properly provided
to "mkarchiso install".
2020-06-30 19:35:56 +02:00
David Runge
47533fd974
Introducing shellcheck in gitlab CI
archiso/mkarchiso:
Quoting all variables.
Changing pkg_list to be an array instead of a string for easier
handling. Using read to properly populate pkg_list from OPTARG with
stripped whitespaces.
Not exporting iso_label anymore as there seems to be no reason to do so.
Introducing line breaks.

.editorconfig:
Setting max_line_length to 120.
Adding a section for YAML files (e.g. .gitlab-ci.yml).

configs/releng/build.sh
Quting nearly all variables.
Introducing line breaks.

configs/baseline/build.sh:
Quoting all variables.
Introducing line breaks.

.gitlab-ci.yml:
Adding gitlab CI for shelleck linting of the config build scripts, mkarchiso and startup scripts in releng.

Closes #19
2020-06-29 20:10:23 +02:00
Christian Hesse
01521adc42 add zstd in supported squashfs compression list
Signed-off-by: Christian Hesse <mail@eworm.de>
2019-09-03 09:34:40 -03:00
Christian Hesse
55cdc1e9bc make sure the root filesystem is owned by root
Signed-off-by: Christian Hesse <mail@eworm.de>
2019-01-09 15:01:51 -03:00
Christian Hesse
3a95b7cafb generate pkglist with query (not sync) operation
Using the sync operation with list option fails with --sysroot when
signed database files are around. Instead use the query operation, which
uses the local databases of installed pakages only.

The only downside is that we do no longer record the originating
repository.

Signed-off-by: Christian Hesse <mail@eworm.de>
2018-07-26 17:15:29 -03:00
Gerardo Exequiel Pozzi
4b7c87fe76 [archiso] Drop --config when using --sysroot
https://lists.archlinux.org/pipermail/arch-releng/2018-June/003834.html

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2018-06-25 13:30:23 -03:00
Gerardo Exequiel Pozzi
5a57d83964 [archiso] Use --sysroot when list installed packages.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2018-06-24 12:49:40 -03:00
Gerardo Exequiel Pozzi
b200ce82f7 Ensure correct umask for scripts
Fix for FS#58473

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
2018-06-23 16:09:33 -03:00
Sean Enck via arch-releng
5f57352398 Drop the '-d' from pacstrap calls
The '-d' in pacstrap is a noop nowadays, keeping it may cause confusion

Signed-off-by: Sean Enck <enckse@gmail.com>
2018-06-17 12:21:37 -03:00
Christian Hesse
acf3ac9884 use a stronger hashing algorithm
Nobody wants to use md5 these days...

Signed-off-by: Christian Hesse <mail@eworm.de>
2017-10-17 23:54:55 -03:00
Gerardo Exequiel Pozzi
63399225b5 Fix non-signed builds
FS#48382
2016-03-01 21:47:44 -03:00
Thomas Bächler
b644d3e923 Optionally sign the squashfs files with gpg
A new option -g <keyid> is added to set the key id. The squashfs files are only signed if
this option is set.
2016-02-28 17:09:08 -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
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
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
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
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
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
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
ab7c443a4a [archiso] Replace rsync with cp
It does not make sense, since filesystem inside the imege is re-formated.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-08-01 20:16:45 -03:00
Gerardo Exequiel Pozzi
a1424446a1 [archiso] Add btrfs support as filesystem for *.fs.sfs
Implements FS#30378

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-07-20 17:31:20 -03:00
Gerardo Exequiel Pozzi
8e9c65fa5d [archiso] mkarchiso: improve info messages
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-05-29 23:48:24 -03:00
Gerardo Exequiel Pozzi
f12097b2c4 [archiso] mkarchiso: add new pkglist command.
This command makes a list of installed packages on root-image,
on <ISO>/$archisobasedir/pkglist.$arch.txt with the format
<repo>/<package>-<version>

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-04-09 17:41:12 -03:00
Gerardo Exequiel Pozzi
9069e2c103 [archiso] mkarchiso: optionally add EFI "El Torito" boot support.
If EFI/archiso/efiboot.img exists then an alternative "El Torito"
boot image is added to the ISO image compatible for EFI.
This image is a FAT filesystem, that is interpreted by EFI as ESP
(EFI System Partition).

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-04-01 12:04:00 -03:00
Gerardo Exequiel Pozzi
67096caef2 [archiso] Re-order and use long xorrisofs options.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-04-01 11:06:29 -03:00
Gerardo Exequiel Pozzi
eed6c84e40 [archiso] Set a safe locale to C
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-03-17 13:47:09 -03:00
Gerardo Exequiel Pozzi
911888b150 [archiso] Improve help message of mkarchiso
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-03-17 13:39:40 -03:00
Gerardo Exequiel Pozzi
3d05bef2b9 [archiso] Implement own chroot functions in mkarchiso
* Remove devtools dependency.
* Better control over what files are touched inside chroot (root-image).
  Now: NONE :)
* Two new commands:
  + init: To install {base} group and other needed packages (syslinux for now)
  + run: If we want to run some command inside chroot
         (mkinitcpio, locale-gen, useradd, etc etc...)
* Renamed command: "created" to "install", says much better what does.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2012-03-16 02:15:59 -03:00