Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2021-12-07 00:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Tue Dec 7 00:00:01 2021 rev:70 rq:936001 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2021-11-11 21:39:23.433018554 +0100 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.31177/mksusecd.changes 2021-12-07 00:01:20.060150172 +0100 @@ -1,0 +2,15 @@ +Mon Dec 6 13:11:46 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/mksusecd#60 +- update documentation +- 2.6 + +-------------------------------------------------------------------- +Mon Dec 6 10:02:49 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/mksusecd#59 +- support tftpboot-installation-<PRODUCT> RPMs as source + (jsc#SLE-22669) +- 2.5 + +-------------------------------------------------------------------- Old: ---- mksusecd-2.4.tar.xz New: ---- mksusecd-2.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.Vrt88s/_old 2021-12-07 00:01:20.696147922 +0100 +++ /var/tmp/diff_new_pack.Vrt88s/_new 2021-12-07 00:01:20.700147908 +0100 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 2.4 +Version: 2.6 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-2.4.tar.xz -> mksusecd-2.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.4/VERSION new/mksusecd-2.6/VERSION --- old/mksusecd-2.4/VERSION 2021-11-11 17:13:05.000000000 +0100 +++ new/mksusecd-2.6/VERSION 2021-12-06 14:11:46.000000000 +0100 @@ -1 +1 @@ -2.4 +2.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.4/changelog new/mksusecd-2.6/changelog --- old/mksusecd-2.4/changelog 2021-11-11 17:13:05.000000000 +0100 +++ new/mksusecd-2.6/changelog 2021-12-06 14:11:46.000000000 +0100 @@ -1,3 +1,12 @@ +2021-12-06: 2.6 + - merge gh#openSUSE/mksusecd#60 + - update documentation + +2021-12-06: 2.5 + - merge gh#openSUSE/mksusecd#59 + - support tftpboot-installation-<PRODUCT> RPMs as source + (jsc#SLE-22669) + 2021-11-11: 2.4 - merge gh#openSUSE/mksusecd#58 - read list of special initrd modules from .base_modules if it exists diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.4/mksusecd new/mksusecd-2.6/mksusecd --- old/mksusecd-2.4/mksusecd 2021-11-11 17:13:05.000000000 +0100 +++ new/mksusecd-2.6/mksusecd 2021-12-06 14:11:46.000000000 +0100 @@ -482,9 +482,16 @@ s#/*$##; next if $_ eq ""; if(-d) { - my $d = (<$_/usr/lib/skelcd/*>)[0]; - if(-d $d ) { - push @sources, { dir => $d, real_name => $_, type => 'dir' }; + my $d_skel = (<$_/usr/lib/skelcd/*>)[0]; + my $d_tftp = (<$_/usr/share/tftpboot-installation/*>)[0]; + if(-d $d_skel ) { + push @sources, { dir => $d_skel, real_name => $_, type => 'dir' }; + } + elsif(-d $d_tftp ) { + # copy only necessary files + my $tmp_dir = $tmp->dir(); + system "cp -r $d_tftp/{EFI,boot} $tmp_dir"; + push @sources, { dir => $d_tftp, real_name => $_, type => 'dir' }; } else { push @sources, { dir => $_, real_name => $_, type => 'dir' }; @@ -503,9 +510,16 @@ $iso_cnt++; my $d_rpm = $tmp->mnt(sprintf("mnt_%04d", $iso_cnt)); system "rpm2cpio $_ | ( cd $d_rpm ; cpio --quiet -dmiu --no-absolute-filenames 2>/dev/null)"; - my $d = (<$d_rpm/usr/lib/skelcd/*>)[0]; - if(-d $d ) { - push @sources, { dir => $d, real_name => $_, type => 'dir' }; + my $d_skel = (<$d_rpm/usr/lib/skelcd/*>)[0]; + my $d_tftp = (<$d_rpm/usr/share/tftpboot-installation/*>)[0]; + if(-d $d_skel ) { + push @sources, { dir => $d_skel, real_name => $_, type => 'dir' }; + } + elsif(-d $d_tftp ) { + # remove unnecessary files + unlink "$d_tftp/README"; + system "rm -r $d_tftp/net"; + push @sources, { dir => $d_tftp, real_name => $_, type => 'dir' }; } else { push @sources, { dir => $d_rpm, real_name => $_, type => 'dir' }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-2.4/mksusecd_man.adoc new/mksusecd-2.6/mksusecd_man.adoc --- old/mksusecd-2.4/mksusecd_man.adoc 2021-11-11 17:13:05.000000000 +0100 +++ new/mksusecd-2.6/mksusecd_man.adoc 2021-12-06 14:11:46.000000000 +0100 @@ -19,6 +19,7 @@ either ISO images or disk images (to be used on USB sticks, for example). mksusecd supports media in both openSUSE/SLES and Fedora/RHEL layout. +See Fedora/RHEL notes for details. The main purpose is to adjust existing installation media. For example @@ -346,6 +347,7 @@ - existing installation media - skelcd-installer-<PRODUCT> packages (RPMs) +- tftpboot-installation-<PRODUCT> packages (RPMs) - additional or modified files that should be added/merged into the image either as image/RPM file or unpacked into a directory. @@ -353,8 +355,9 @@ The order of sources is important. Files from later sources will replace the same files in previous sources. -If you pass a skelcd-installer-<PRODUCT> RPM (or a directory with the same -layout) - mksusecd will handle these specially and use the relevant parts. +If you pass a skelcd-installer-<PRODUCT> or tftpboot-installation-<PRODUCT> +RPM (or a directory with the same layout) - mksusecd will handle these +specially and extract the relevant parts. === Hybrid mode notes @@ -483,6 +486,29 @@ Check the available modules with *--list-repos* and then pick the modules you need with *--include-repos*. +=== Fedora/RHEL notes + +Not all options apply to media with Fedora/RHEL layout. The major options that work, are: + +- *--boot* to add boot options +- *--initrd* to modify the initrd (stage1) +- *--instsys* to modify the live installation system (stage2) + +mksusecd will by default create media with a SUSE-like hybrid mode (MBR +partition table with non-overlapping partitions). You can change that to +create the Fedora/RHEL hybrid mode (hybrid GPT+MBR, partition starting at offset 0) +by adding these options: + +*--gpt --mbr --hybrid-fs ""*. + +Notes + +- You can use *--sign-image* to create signed images. The image +signature can be verified with checkmedia. checkisomd5 can only verify the +embedded MD5 sums. + +- You can use other digests instead of MD5 using *--digest DIGEST* but +checkisomd5 cannot verify these images. + === Crypto notes The *--crypto* option allows you to create an encrypted installation disk. @@ -541,7 +567,6 @@ == Examples -[source] ---- # create foo.iso from /foo_dir mksusecd --create foo.iso /foo_dir