* Added packages needed to support offline machines to striker-manage-install-target.

* Cleaned up the returned 'return_code' in System->call() when background is true.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 5 years ago
parent ea27f88bcc
commit 70776964d6
  1. 9
      Anvil/Tools/System.pm
  2. 3
      rpm/SPECS/anvil.spec
  3. 35
      tools/striker-manage-install-target

@ -317,9 +317,14 @@ sub call
# Report that it started with PID. # Report that it started with PID.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, key => "log_0205", variables => { call => $shell_call, pid => $process->pid }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, key => "log_0205", variables => { call => $shell_call, pid => $process->pid }});
# We'll return the handle instead of output. # We'll return the handle instead of output. There's no return code from the
# program, so set it to 0 to show we initiated the program in the background.
$return_code = 0;
$output = $process; $output = $process;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, list => { output => $output }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, list => {
return_code => $return_code,
output => $output,
}});
} }
else else
{ {

@ -204,6 +204,7 @@ sed -i.anvil 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
setenforce 0 setenforce 0
sed -i "1s/^.*$/%{version}-%{release}/" /%{_sysconfdir}/anvil/anvil.version sed -i "1s/^.*$/%{version}-%{release}/" /%{_sysconfdir}/anvil/anvil.version
# Enable and start the anvil-daemon # Enable and start the anvil-daemon
### TODO: check it if was disabled (if it existed before) and, if so, leave it disabled.
systemctl enable anvil-daemon.service systemctl enable anvil-daemon.service
systemctl start anvil-daemon.service systemctl start anvil-daemon.service
@ -348,7 +349,7 @@ fi
%changelog %changelog
* Wed Nov 6 2019 Madison Kelly <mkelly@alteeve.ca> 3.0-29 * Thu Nov 7 2019 Madison Kelly <mkelly@alteeve.ca> 3.0-29
- Added '/etc/anvil/type.X' file creation to more directly mark a system as a - Added '/etc/anvil/type.X' file creation to more directly mark a system as a
specific type, rather than divining by name. specific type, rather than divining by name.
- Updated source. - Updated source.

@ -1112,8 +1112,9 @@ sub load_packages
} }
} }
### TODO: These need to be sorted into groups by their first letter, and those groups need to go under Packages ### NOTE: If/when we support other archs, removing '.x86_64/.noarch' would cause all available archs
### TODO: Update this for EL8 ### to be downloaded (including .ix86, which would waste space...). Decide if it's best to
### explicitely declare archs vs using space/bandwidth to just grab all available.
# This is the list of packages we need to download. # This is the list of packages we need to download.
$anvil->data->{packages} = { $anvil->data->{packages} = {
a => [ a => [
@ -1135,6 +1136,7 @@ sub load_packages
"apr-util-openssl.x86_64", "apr-util-openssl.x86_64",
"apr-util.x86_64", "apr-util.x86_64",
"apr.x86_64", "apr.x86_64",
"aspell.x86_64",
"at-spi2-atk.x86_64", "at-spi2-atk.x86_64",
"at-spi2-core.x86_64", "at-spi2-core.x86_64",
"atk.x86_64", "atk.x86_64",
@ -1254,6 +1256,7 @@ sub load_packages
#"dnf-utils.noarch", #"dnf-utils.noarch",
"dnf.noarch", "dnf.noarch",
"dnsmasq.x86_64", "dnsmasq.x86_64",
"dosfstools.x86_64",
"dracut-config-rescue.x86_64", "dracut-config-rescue.x86_64",
"dracut-network.x86_64", "dracut-network.x86_64",
"dracut-squash.x86_64", "dracut-squash.x86_64",
@ -1338,6 +1341,7 @@ sub load_packages
"gcr.x86_64", "gcr.x86_64",
"gdbm-libs.x86_64", "gdbm-libs.x86_64",
"gdbm.x86_64", "gdbm.x86_64",
"gdisk.x86_64",
"gdk-pixbuf2-modules.x86_64", "gdk-pixbuf2-modules.x86_64",
"gdk-pixbuf2.x86_64", "gdk-pixbuf2.x86_64",
"gdm.x86_64", "gdm.x86_64",
@ -1409,6 +1413,8 @@ sub load_packages
"gtk-vnc2.x86_64", "gtk-vnc2.x86_64",
"gtk2.x86_64", "gtk2.x86_64",
"gtk3.x86_64", "gtk3.x86_64",
"gvfs.x86_64",
"gvfs-client.x86_64",
"gvnc.x86_64", "gvnc.x86_64",
"gzip.x86_64", "gzip.x86_64",
], ],
@ -1533,15 +1539,28 @@ sub load_packages
"libarchive.x86_64", "libarchive.x86_64",
"libassuan.x86_64", "libassuan.x86_64",
"libasyncns.x86_64", "libasyncns.x86_64",
"libatasmart.x86_64",
"libattr.x86_64", "libattr.x86_64",
"libbasicobjects.x86_64", "libbasicobjects.x86_64",
"libblkid.x86_64", "libblkid.x86_64",
"libbytesize.x86_64",
"libbluray.x86_64",
"libcacard.x86_64", "libcacard.x86_64",
"libcanberra-gtk3.x86_64", "libcanberra-gtk3.x86_64",
"libcanberra.x86_64", "libcanberra.x86_64",
"libcap-ng.x86_64", "libcap-ng.x86_64",
"libcap.x86_64", "libcap.x86_64",
"libcdio.x86_64",
"libcdio-paranoia.x86_64",
"libcgroup.x86_64", "libcgroup.x86_64",
"libblockdev.x86_64",
"libblockdev-crypto.x86_64",
"libblockdev-fs.x86_64",
"libblockdev-loop.x86_64",
"libblockdev-mdraid.x86_64",
"libblockdev-part.x86_64",
"libblockdev-swap.x86_64",
"libblockdev-utils.x86_64",
"libcollection.x86_64", "libcollection.x86_64",
"libcom_err.x86_64", "libcom_err.x86_64",
"libcomps.x86_64", "libcomps.x86_64",
@ -1623,6 +1642,7 @@ sub load_packages
"libnl3.x86_64", "libnl3.x86_64",
"libnma.x86_64", "libnma.x86_64",
"libnotify.x86_64", "libnotify.x86_64",
"libnozzle1.x86_64",
"libnsl2.x86_64", "libnsl2.x86_64",
"liboauth.x86_64", "liboauth.x86_64",
"libogg.x86_64", "libogg.x86_64",
@ -1664,6 +1684,7 @@ sub load_packages
"libsoup.x86_64", "libsoup.x86_64",
"libss.x86_64", "libss.x86_64",
"libssh.x86_64", "libssh.x86_64",
"libssh-config.noarch",
"libssh2.x86_64", "libssh2.x86_64",
"libsss_autofs.x86_64", "libsss_autofs.x86_64",
"libsss_certmap.x86_64", "libsss_certmap.x86_64",
@ -1683,6 +1704,7 @@ sub load_packages
"libtiff.x86_64", "libtiff.x86_64",
"libtirpc.x86_64", "libtirpc.x86_64",
"libtool-ltdl.x86_64", "libtool-ltdl.x86_64",
"libudisks2.x86_64",
"libunistring.x86_64", "libunistring.x86_64",
"libusal.x86_64", "libusal.x86_64",
"libusbmuxd.x86_64", "libusbmuxd.x86_64",
@ -1761,6 +1783,7 @@ sub load_packages
"mailcap.noarch", "mailcap.noarch",
"man-db.x86_64", "man-db.x86_64",
"mcpp.x86_64", "mcpp.x86_64",
"mdadm.x86_64",
"mesa-dri-drivers.x86_64", "mesa-dri-drivers.x86_64",
"mesa-filesystem.x86_64", "mesa-filesystem.x86_64",
"mesa-libEGL.x86_64", "mesa-libEGL.x86_64",
@ -1774,6 +1797,7 @@ sub load_packages
"ModemManager-glib.x86_64", "ModemManager-glib.x86_64",
"mozilla-filesystem.x86_64", "mozilla-filesystem.x86_64",
"mozjs52.x86_64", "mozjs52.x86_64",
"mozjs60.x86_64",
"mpfr.x86_64", "mpfr.x86_64",
"mtdev.x86_64", "mtdev.x86_64",
"mtools.x86_64", "mtools.x86_64",
@ -2046,6 +2070,7 @@ sub load_packages
#"python3-IPy.noarch", #"python3-IPy.noarch",
"python3-asn1crypto.noarch", "python3-asn1crypto.noarch",
"python3-audit.x86_64", "python3-audit.x86_64",
"python3-argcomplete.noarch",
"python3-bind.noarch", "python3-bind.noarch",
"python3-cairo.x86_64", "python3-cairo.x86_64",
"python3-cffi.x86_64", "python3-cffi.x86_64",
@ -2082,6 +2107,7 @@ sub load_packages
"python3-perf.x86_64", "python3-perf.x86_64",
"python3-pexpect.noarch", "python3-pexpect.noarch",
"python3-pip.noarch", "python3-pip.noarch",
"python3-pip-wheel.noarch",
"python3-ply.noarch", "python3-ply.noarch",
"python3-policycoreutils.noarch", "python3-policycoreutils.noarch",
"python3-ptyprocess.noarch", "python3-ptyprocess.noarch",
@ -2095,6 +2121,7 @@ sub load_packages
"python3-schedutils.x86_64", "python3-schedutils.x86_64",
"python3-setools.x86_64", "python3-setools.x86_64",
"python3-setuptools.noarch", "python3-setuptools.noarch",
"python3-setuptools-wheel.noarch",
"python3-six.noarch", "python3-six.noarch",
"python3-slip-dbus.noarch", "python3-slip-dbus.noarch",
"python3-slip.noarch", "python3-slip.noarch",
@ -2105,6 +2132,7 @@ sub load_packages
"python3-unbound.x86_64", "python3-unbound.x86_64",
"python3-urllib3.noarch", "python3-urllib3.noarch",
"python3-webencodings.noarch", "python3-webencodings.noarch",
"python36.x86_64",
], ],
'q' => [ 'q' => [
"qemu-guest-agent.x86_64", "qemu-guest-agent.x86_64",
@ -2203,6 +2231,7 @@ sub load_packages
"systemd.x86_64", "systemd.x86_64",
], ],
t => [ t => [
"tar.x86_64",
"tcl.x86_64", "tcl.x86_64",
"teamd.x86_64", "teamd.x86_64",
"telnet.x86_64", "telnet.x86_64",
@ -2216,6 +2245,7 @@ sub load_packages
"tzdata.noarch", "tzdata.noarch",
], ],
u => [ u => [
"udisks2.x86_64",
"unbound-libs.x86_64", "unbound-libs.x86_64",
"upower.x86_64", "upower.x86_64",
"usbredir.x86_64", "usbredir.x86_64",
@ -2234,6 +2264,7 @@ sub load_packages
"virt-manager-common.noarch", "virt-manager-common.noarch",
"virt-manager.noarch", "virt-manager.noarch",
"virt-what.x86_64", "virt-what.x86_64",
"volume_key-libs.x86_64",
"vte-profile.x86_64", "vte-profile.x86_64",
"vte291.x86_64", "vte291.x86_64",
], ],

Loading…
Cancel
Save