diff options
-rwxr-xr-x | Fedora-efi-grub2.sh | 4 | ||||
-rwxr-xr-x | Fedora-efi-systemd.sh | 4 | ||||
-rwxr-xr-x | Fedora-setup.sh | 20 | ||||
-rwxr-xr-x | Fedora-wsl.sh | 4 | ||||
-rwxr-xr-x | repos/Make-fedora-repo.sh | 2 |
5 files changed, 27 insertions, 7 deletions
diff --git a/Fedora-efi-grub2.sh b/Fedora-efi-grub2.sh index b67b26b..1550da5 100755 --- a/Fedora-efi-grub2.sh +++ b/Fedora-efi-grub2.sh @@ -1,8 +1,8 @@ #!/bin/sh -vers="${1-30}" +source Fedora-setup.sh + name="fedora-${vers}-efi-grub2" -repo="repos/fedora-${vers}-$(sh basearch.sh).repo" rpms="-grubby -dracut-config-rescue dracut-config-generic" rpms_i686="grub2-efi-ia32 grub2-pc" diff --git a/Fedora-efi-systemd.sh b/Fedora-efi-systemd.sh index 92c31b8..16b6ca8 100755 --- a/Fedora-efi-systemd.sh +++ b/Fedora-efi-systemd.sh @@ -1,8 +1,8 @@ #!/bin/sh -vers="${1-30}" +source Fedora-setup.sh + name="fedora-${vers}-efi-systemd" -repo="repos/fedora-${vers}-$(sh basearch.sh).repo" rpms="-grubby -dracut-config-rescue dracut-config-generic" rpms_i686="grub2-pc" diff --git a/Fedora-setup.sh b/Fedora-setup.sh new file mode 100755 index 0000000..a694245 --- /dev/null +++ b/Fedora-setup.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +vers="${1-33}" +repo="repos/fedora-${vers}-$(sh basearch.sh).repo" + +# figure what we are running on +eval $(grep ID= /etc/os-release) + +if test ! -f "$repo" -a "$ID" = "fedora"; then + echo "# no repo, using machine repos" + for config in fedora; do + file="/etc/yum.repos.d/${config}.repo" + echo "# << $file" + sed -e "s/^\[/[mkimage-/" \ + -e "s/\$releasever/$vers/" \ + -e "s/\$basearch/$(sh basearch.sh)/" \ + < "$file" >> "$repo" + done + echo "# >> $repo" +fi diff --git a/Fedora-wsl.sh b/Fedora-wsl.sh index c15e992..72a6222 100755 --- a/Fedora-wsl.sh +++ b/Fedora-wsl.sh @@ -1,8 +1,8 @@ #!/bin/sh -vers="${1-30}" +source Fedora-setup.sh + name="fedora-${vers}-wsl" -repo="repos/fedora-${vers}-$(sh basearch.sh).repo" rpms="strace git" tar="${IMAGEFISH_DESTDIR-.}/${name}.tar" diff --git a/repos/Make-fedora-repo.sh b/repos/Make-fedora-repo.sh index 6dbfc71..82bc76e 100755 --- a/repos/Make-fedora-repo.sh +++ b/repos/Make-fedora-repo.sh @@ -56,7 +56,7 @@ EOF ################################################################################ -rels="31" +rels="33" archs="aarch64 armhfp x86_64" for rel in $rels; do |