Skip to content

Commit e6861e9

Browse files
committed
Fix some linting, remove run_iso.sh
1 parent 54d1299 commit e6861e9

File tree

4 files changed

+39
-96
lines changed

4 files changed

+39
-96
lines changed

CHANGELOG.md

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The format is based on [Keep a changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
Changelogs can easily created with the following commands.
9+
910
```bash
1011
# List all tags created by creation date
1112
git tag --sort=-creatordate
@@ -21,45 +22,46 @@ git log ${TAG_CREATED_FROM}..HEAD | grep '^ ' | trim
2122
* Add support for running GitHub-Actions [locally](https://www.freecodecamp.org/news/how-to-run-github-actions-locally/)
2223
* Add support for [remove packages](https://wiki.archlinux.org/title/User:LenHuppe/ZFS_on_Archiso/)
2324
* Add usage for `kernel.archzfs.com`
24-
* [Link](https://end.re/blog/ebp036_archzfs-repo-for-kernels/)
25-
* [Source](https://github.com/archzfs/archzfs/issues/467#issuecomment-1332029677)
25+
* [Link](https://end.re/blog/ebp036_archzfs-repo-for-kernels/)
26+
* [Source](https://github.com/archzfs/archzfs/issues/467#issuecomment-1332029677)
2627
* Add flag `-c|--cleanup` for `build.sh`
2728

2829
### To Change
2930

30-
* Reduce the iso size since this is way about 2 GiB while the official image has a size of 1.1 GiB by checking:
31-
* Compare installed packages (mount/start official iso and run `pacman -Qq` and do the same on our build)
32-
* Check if we can remove HOOKS in `airootfs/etc/mkinitcpio.conf`
33-
* Check if official image also has that high amount of firmware
34-
* Check if lts image contains non-lts kernel by mistake
35-
* Check `releng/packages.x86_64` if we really need all in there
31+
* Reduce the iso size (lts greater 2 GiB, while image arount 1.1 GiB):
32+
* Compare installed packages (mount/start official iso and run `pacman -Qq`)
33+
* Check if we can remove HOOKS in `airootfs/etc/mkinitcpio.conf`
34+
* Check if official image also has that high amount of firmware
35+
* Check if lts image contains non-lts kernel by mistake
36+
* Check `releng/packages.x86_64` if we really need all in there
3637
* Apply [shellcheck](https://github.com/koalaman/shellcheck) to all scripts
3738
* Manipulate `dynamic_dat/releng/profiledef.sh` before running the iso build process
38-
* [issue/9](https://github.com/stevleibelt/arch-linux-live-cd-iso-with-zfs/issues/9)
39-
* [official profiledef.sh documentation](https://gitlab.archlinux.org/archlinux/archiso/-/blob/master/docs/README.profile.rst)
40-
* [example of an manipulated file](https://github.com/HougeLangley/archzfs-iso/blob/master/profiledef.sh)
41-
* Things to change
42-
* `iso_name`
43-
* `iso_label`
44-
* `iso_publisher`
45-
* `iso_application`
46-
* `file_permissions`
47-
* own git repros in user home should have 775
48-
* Recheck GitHub actions using things like [this](https://github.com/ossf/education/pull/36/files) as an example
49-
* Validate if we can implement the "use older kernel" feature from [here](https://github.com/eoli3n/archiso-zfs/blob/master/init) to prevent failing builds when the archzfs package is not up to date to the latest linux kernel
39+
* [issue/9](https://github.com/stevleibelt/arch-linux-live-cd-iso-with-zfs/issues/9)
40+
* [official profiledef.sh documentation](https://gitlab.archlinux.org/archlinux/archiso/-/blob/master/docs/README.profile.rst)
41+
* [example of an manipulated file](https://github.com/HougeLangley/archzfs-iso/blob/master/profiledef.sh)
42+
* Things to change
43+
* `iso_name`
44+
* `iso_label`
45+
* `iso_publisher`
46+
* `iso_application`
47+
* `file_permissions`
48+
* own git repros in user home should have 775
49+
* Recheck GitHub actions, [see](https://github.com/ossf/education/pull/36/files)
50+
* Validate if we can implement the "use older kernel" feature from [here](https://github.com/eoli3n/archiso-zfs/blob/master/init)
5051

5152
## Unreleased
5253

5354
### Added in unreleased
5455

5556
* Added arguments to [run the iso](run_iso.sh) script, check out `run_iso.sh`
56-
* Added environment variable `ISO_BOOT_TYPE` to prevent question about "uefi or bios" when try to [run the iso](run_iso.sh)
57+
* Added environment variable `ISO_BOOT_TYPE` (prevents "uefi ..." in [run the iso](run_iso.sh))
5758
* Added `last_build_date*.txt` to [gitignore](.gitignore)
5859
* Added `-z|--zfs-servers` as option to switch to experimental archzfs repository
5960

6061
### Changed in unreleased
6162

62-
* Merged `ZFS_SERVER='default'` and `ZFS_SERVER='experimental'` since only experimental deliveres openzfs >= 2.4.0
63+
* Merged `ZFS_SERVER='default|experimental'`, only experimental has openzfs >= 2.4.0
64+
* Remove `dump_iso.sh`
6365

6466
## [3.2.0](https://github.com/stevleibelt/arch-linux-live-cd-iso-with-zfs/tree/3.2.0) - 20251104
6567

@@ -103,27 +105,27 @@ git log ${TAG_CREATED_FROM}..HEAD | grep '^ ' | trim
103105
### Added in 3.0.0
104106

105107
* Added content of repository [bht](https://github.com/ezonakiusagi/bht) below `software`
106-
* Added `compose.yml` to be able to build iso inside a privileged docker container
108+
* Added `compose.yml` to be able to build iso inside a privileged docker container
107109
* Added links to openssf and badge
108110
* Added packages mailx, ksh and nmon
109111
* Added [SECURITY.md](SECURITY.md)
110-
* Added script `create_efibootmgr_entry.sh` to ease up fixing lost `ZFSBootMenu` entries
112+
* Added script `create_efibootmgr_entry.sh` to fix lost `ZFSBootMenu` entries
111113
* Added script `start_sshd.sh`
112114
* Added section in `.env` to add or to remove packages
113115
* Added support for `-l|--lts` as kernel in [upload_iso.sh](upload_iso.sh)
114116

115117
### Changed in 3.0.0
116118

117119
* Changed default values for [replace_zfsbootmenu.sh](source/replace_zfsbootmenu.sh)
118-
* Default path for old ZBM is now `/mnt/efi...`
119-
* Default path for new ZBM is now basepath of the called script
120-
* Moved from build image `archlinux:latest` to `archlinux/archlinux:latest` to fix issues like [archinstal#2443](https://github.com/archlinux/archinstall/issues/2443)
120+
* Default path for old ZBM is now `/mnt/efi...`
121+
* Default path for new ZBM is now basepath of the called script
122+
* Moved to `archlinux/archlinux:latest` fixing [archinstal#2443](https://github.com/archlinux/archinstall/issues/2443)
121123
* Moved archzfs mirrorlist to dedicated file `/etc/pacman.d/archzfs`
122124

123125
### Breaking Changes in 3.0.0
124126

125-
* Instead of different configuration files below `<project_root>/configuration/`, there is now a unified `.env` file and a `.env.dist`
126-
* Migration should work by executing `cat configuration/*.sh > .env`
127+
* Merged multiple configuration files to `.env`
128+
* Migration works by executing `cat configuration/*.sh > .env`
127129

128130
## [2.11.1](https://github.com/stevleibelt/arch-linux-live-cd-iso-with-zfs/tree/2.11.1) - 20231111
129131

@@ -136,12 +138,12 @@ git log ${TAG_CREATED_FROM}..HEAD | grep '^ ' | trim
136138
### Added in 2.11.0
137139

138140
* Added dedicated iso building workflows for
139-
* `lts_dkms`
140-
* `lts_no_dkms`
141-
* `no_lts_dkms`
142-
* `no_lts_no_dkms`
141+
* `lts_dkms`
142+
* `lts_no_dkms`
143+
* `no_lts_dkms`
144+
* `no_lts_no_dkms`
143145
* Added step to download latest zfsbootmenu.EFI file
144-
* Added script `replace_zfsbootmenu.sh` to ease up updating a system to the latest zfsbootmenu
146+
* Added script `replace_zfsbootmenu.sh` to update zfsbootmenu
145147

146148
### Changed in 2.11.0
147149

@@ -152,8 +154,8 @@ git log ${TAG_CREATED_FROM}..HEAD | grep '^ ' | trim
152154
### Added in 2.10.0
153155

154156
* Added build option to use git package for `zfs-dkms-git` or `zfs-linux-git`
155-
* Either use `USE_GIT_PACKAGE` in the configuration file
156-
* Or use `build.sh -g`
157+
* Either use `USE_GIT_PACKAGE` in the configuration file
158+
* Or use `build.sh -g`
157159

158160
## [2.9.0](https://github.com/stevleibelt/arch-linux-live-cd-iso-with-zfs/tree/2.9.0) - 20230523
159161

dump_iso.sh

Lines changed: 0 additions & 56 deletions
This file was deleted.

run_iso.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function _main ()
6464
if [[ ${SHOW_HELP} -eq 1 ]];
6565
then
6666
echo ":: Usage"
67-
echo " ${0} [-b|--boot-type <string: boot_type="${ISO_BOOT_TYPE}"] [-k|--kernel <string: kernel=${KERNEL}]"
67+
echo " ${0} [-b|--boot-type <string: boot_type=\"${ISO_BOOT_TYPE}\"] [-k|--kernel <string: kernel=${KERNEL}]"
6868

6969
exit 0
7070
fi

upload_iso.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ function _main ()
7474
local PATH_TO_THE_ISO
7575
local PATH_TO_THE_ISO_SHA512
7676
local PATH_TO_THE_LATEST_BUILD_DATE
77-
local PATH_TO_THE_LOCAL_CONFIGURATION
7877
local PATH_TO_THE_OPTIONAL_ENVIRONMENT_FILE
7978
local PATH_TO_THIS_SCRIPT
8079

@@ -85,13 +84,11 @@ function _main ()
8584
#eo: variables
8685

8786
#we are storing all arguments for the case if the script needs to be re-executed as root/system user
88-
local ALL_ARGUMENTS_TO_PASS
8987
local BE_VERBOSE
9088
local IS_DRY_RUN
9189
local KERNEL
9290
local SHOW_HELP
9391

94-
ALL_ARGUMENTS_TO_PASS="${@}"
9592
BE_VERBOSE=0
9693
IS_DRY_RUN=0
9794
KERNEL="linux"

0 commit comments

Comments
 (0)