Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update src/live to match agama-installer-openSUSE #1436

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion live/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $(DESTDIR)/%.tar.xz: % $$(shell find % -type f,l)

# build the ISO locally
build: $(DESTDIR)
if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc co -o $(DESTDIR) $(OBS_PROJECT) agama-live; fi
if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc co -o $(DESTDIR) $(OBS_PROJECT) agama-installer-openSUSE; fi
$(MAKE) all
(cd $(DESTDIR) && osc build -M $(FLAVOR) images)

Expand Down
12 changes: 6 additions & 6 deletions live/PXE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Extract the Linux kernel and the initrd from the archive:
```shell
osc getbinaries images x86_64 -M ALP-PXE
tar -C /srv/ftp/image -xf \
binaries/agama-live.x86_64-5.0.0-ALP-PXE-Build4.1.install.tar
binaries/agama-installer-openSUSE.x86_64-5.0.0-ALP-PXE-Build4.1.install.tar

cp /srv/ftp/image/pxeboot.agama-live.x86_64-5.0.0.initrd /srv/tftpboot/boot
cp /srv/ftp/image/pxeboot.agama-live.x86_64-5.0.0.kernel /srv/tftpboot/boot
cp /srv/ftp/image/pxeboot.agama-installer-openSUSE.x86_64-9.0.0.initrd /srv/tftpboot/boot
cp /srv/ftp/image/pxeboot.agama-installer-openSUSE.x86_64-9.0.0.kernel /srv/tftpboot/boot
```

Update the PXE boot configuration in the `/srv/tftpboot/pxelinux.cfg/default`
Expand All @@ -32,15 +32,15 @@ menu title PXE Menu

label live
menu label ^Agama
kernel /boot/pxeboot.agama-live.x86_64-5.0.0.kernel
append initrd=/boot/pxeboot.agama-live.x86_64-5.0.0.initrd rd.kiwi.install.pxe rd.kiwi.install.image=ftp://X.X.X.X/image/agama-live.x86_64-5.0.0.xz console=ttyS0,115200 rd.kiwi.ramdisk ramdisk_size=2097152
kernel /boot/pxeboot.agama-installer-openSUSE.x86_64-9.0.0.kernel
append initrd=/boot/pxeboot.agama-installer-openSUSE.x86_64-9.0.0.initrd rd.kiwi.install.pxe rd.kiwi.install.image=ftp://X.X.X.X/image/agama-installer-openSUSE.x86_64-9.0.0.xz console=ttyS0,115200 rd.kiwi.ramdisk ramdisk_size=2097152
```

## Testing

To test booting Agama in QEMU run these commands:

```shell
qemu-img create mydisk 20g
qemu-img create mydisk 25g
qemu -boot n -m 4096 -hda mydisk
```
2 changes: 1 addition & 1 deletion live/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ build workflow and the `.kiwi` file format.

The main Kiwi source files are located in the [src](src) subdirectory:

- [agama-live.kiwi](src/agama-live.kiwi) is the main KIWI file which drives the ISO image build.
- [agama-installer-openSUSE.kiwi](src/agama-installer-openSUSE.kiwi) is the main KIWI file which drives the ISO image build.
- [config.sh](src/config.sh) is a KIWI hook script which is called and the end of the build process,
after all packages are installed but before compressing and building the image. The script runs in
the image chroot and is usually used to adjust the system configuration (enable/disable services,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jul 4 11:24:47 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>

- Update src/live to match rename to agama-installer-openSUSE
fixes issue that bot updates wrong spec/changes file

- Update README and PXE to reference to agama-installer-openSUSE

- Update PXE instructions to create 25GB image instead of 20
Current agama can't deploy e.g. Leap 16 on 20GB disk image
with default layout including swap

-------------------------------------------------------------------
Wed Jul 3 10:41:32 UTC 2024 - Knut Anderssen <kanderssen@suse.com>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 ppc64le x86_64 s390x -->
<!-- OBS-Profiles: @BUILD_FLAVOR@ -->

<image schemaversion="7.5" name="agama-live">
<image schemaversion="7.5" name="agama-installer-openSUSE">
<description type="system">
<author>YaST Team</author>
<contact>yast2-maintainers@suse.de</contact>
Expand Down