edge-simplified-installer: use coreos-installer-dracut

Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2021-11-02 09:58:29 +01:00 committed by Achilleas Koutsou
parent a0569c784e
commit 26b96483a3
5 changed files with 19 additions and 19 deletions

View file

@ -724,7 +724,7 @@ func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
"bsdtar",
"cloud-utils-growpart",
"coreos-installer",
"coreos-installer-bootinfra",
"coreos-installer-dracut",
"coreutils",
"device-mapper-multipath",
"dnsmasq",
@ -746,6 +746,7 @@ func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
"policycoreutils-python-utils",
"procps-ng",
"rootfiles",
"rdma-core",
"setools-console",
"sudo",
"traceroute",

View file

@ -1198,8 +1198,7 @@ func simplifiedInstallerTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.
p.AddStage(osbuild.NewRPMStage(rpmStageOptions(repos), rpmStageInputs(packages)))
p.AddStage(osbuild.NewBuildstampStage(buildStampStageOptions(arch, product, osVersion, variant)))
p.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: "en_US.UTF-8"}))
p.AddStage(osbuild.NewSystemdStage(systemdStageOptions([]string{"coreos-installer"}, nil, nil, "")))
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{"rdcore"})))
p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{"coreos-installer"})))
return p
}

View file

@ -339,7 +339,7 @@ func grubISOStageOptions(installDevice, kernelVer, arch, vendor, product, osVers
"console=ttyS0",
"systemd.log_target=console",
"systemd.journald.forward_to_console=1",
"edge.liveiso=" + isolabel,
"coreos.inst.isoroot=" + isolabel,
"coreos.inst.install_dev=" + installDevice,
"coreos.inst.image_file=/run/media/iso/disk.img.xz",
"coreos.inst.insecure"},