#91 Base for f27
Merged 6 years ago by dustymabe. Opened 6 years ago by puiterwijk.
puiterwijk/fedora-atomic f27-uut  into  f27

@@ -0,0 +1,143 @@ 

+ {

+     "ref": "fedora/27/${basearch}/atomic-host",

+ 

+     "repos": [],

+ 

+     "selinux": true,

+ 

+     "documentation": false,

+ 

+     "automatic_version_prefix": "27",

+     "mutate-os-release": "27",

+ 

+     "initramfs-args": ["--no-hostonly", "--add", "iscsi"],

+ 

+     "install-langs-comment": "Keep this in sync with treecompose-post.sh",

+     "install-langs": [

+       "pt_BR",

+       "fr",

+       "fr_FR",

+       "de",

+       "de_DE",

+       "it",

+       "it_IT",

+       "ru",

+       "ru_RU",

+       "es",

+       "es_ES",

+       "en_US",

+       "zh_CN",

+       "ja",

+       "ja_JP",

+       "ko",

+       "ko_KR",

+       "zh_TW",

+       "as",

+       "as_IN",

+       "bn",

+       "bn_IN",

+       "gu",

+       "gu_IN",

+       "hi",

+       "hi_IN",

+       "kn",

+       "kn_IN",

+       "ml",

+       "ml_IN",

+       "mr",

+       "mr_IN",

+       "or",

+       "or_IN",

+       "pa",

+       "pa_IN",

+       "ta",

+       "ta_IN",

+       "te",

+       "te_IN"

+     ],

+ 

+     "postprocess-script": "treecompose-post.sh",

+ 

+     "etc-group-members": ["wheel", "docker"],

+ 

+     "ignore-removed-users": ["root"],

+     "ignore-removed-groups": ["root"],

+     "check-passwd": { "type": "file", "filename": "passwd" },

+     "check-groups": { "type": "file", "filename": "group" },

+ 

+     "packages": ["atomic",

+          "glibc", "nss-altfiles", "shadow-utils",

+          "sssd-client", "libsss_sudo",

+          "fedora-release-atomichost",

+          "dracut-config-generic", "kernel",

+          "dracut-network",

+          "rpm-ostree", "lvm2",

+          "chrony",

+          "cryptsetup",

+          "authconfig",

+          "btrfs-progs", "e2fsprogs", "xfsprogs",

+          "gnupg2",

+          "basesystem",

+          "python",

+          "bash",

+          "xz", "gzip", "bzip2",

+          "coreutils",

+          "bridge-utils",

+          "which",

+          "nfs-utils",

+          "curl",

+          "iptables-services", "iptables",

+          "NetworkManager",

+          "dnsmasq",

+          "hostname", "initscripts", "iproute", "iputils", "less",

+          "sos",

+          "openssh-clients", "openssh-server", "passwd",

+          "policycoreutils", "procps-ng", "rootfiles", "rpm",

+          "selinux-policy-targeted", "setup", "shadow-utils",

+          "sudo", "systemd", "util-linux", "vim-minimal",

+          "less",

+          "tar",

+          "cloud-init",

+          "cloud-utils-growpart",

+          "rsync",

+          "bash-completion",

+          "tmux", "screen",

+          "strace", "lsof", "tcpdump", "nmap-ncat",

+          "policycoreutils-python",

+          "policycoreutils-python-utils",

+          "setools-console",

+          "audit",

+          "cockpit-bridge",

+          "cockpit-system",

+          "cockpit-docker",

+          "cockpit-networkmanager",

+          "cockpit-ostree",

+          "docker",

+          "python-docker-py",

+          "iscsi-initiator-utils",

+          "glusterfs", "glusterfs-fuse",

+          "ceph-common",

+          "oddjob-mkhomedir",

+          "oci-register-machine",

+          "oci-systemd-hook",

+          "mdadm",

+          "runc",

+          "attr"],

+ 

+     "packages-aarch64": ["grub2-efi", "ostree-grub2",

+                          "efibootmgr", "shim", "atomic-devmode"],

+ 

+     "packages-armhfp": ["extlinux-bootloader"],

+ 

+     "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],

+ 

+     "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],

+ 

+     "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",

+                          "efibootmgr", "shim", "atomic-devmode",

+                          "microcode_ctl"],

+ 

+     "default_target": "multi-user.target",

+ 

+     "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"]

+ }

@@ -1,4 +1,4 @@ 

  {

      "ref": "fedora/27/${basearch}/updates/atomic-host",

-     "include": "fedora-atomic-host.json"

+     "include": "fedora-atomic-host-base.json"

  }

@@ -1,4 +1,4 @@ 

  {

      "ref": "fedora/27/${basearch}/testing/atomic-host",

-     "include": "fedora-atomic-host.json"

+     "include": "fedora-atomic-host-base.json"

  }

file modified
+1 -139
@@ -1,143 +1,5 @@ 

  {

      "ref": "fedora/27/${basearch}/atomic-host",

- 

      "repos": ["fedora-27", "fedora-27-updates"],

- 

-     "selinux": true,

- 

-     "documentation": false,

- 

-     "automatic_version_prefix": "27",

-     "mutate-os-release": "27",

- 

-     "initramfs-args": ["--no-hostonly", "--add", "iscsi"],

- 

-     "install-langs-comment": "Keep this in sync with treecompose-post.sh",

-     "install-langs": [

-       "pt_BR",

-       "fr",

-       "fr_FR",

-       "de",

-       "de_DE",

-       "it",

-       "it_IT",

-       "ru",

-       "ru_RU",

-       "es",

-       "es_ES",

-       "en_US",

-       "zh_CN",

-       "ja",

-       "ja_JP",

-       "ko",

-       "ko_KR",

-       "zh_TW",

-       "as",

-       "as_IN",

-       "bn",

-       "bn_IN",

-       "gu",

-       "gu_IN",

-       "hi",

-       "hi_IN",

-       "kn",

-       "kn_IN",

-       "ml",

-       "ml_IN",

-       "mr",

-       "mr_IN",

-       "or",

-       "or_IN",

-       "pa",

-       "pa_IN",

-       "ta",

-       "ta_IN",

-       "te",

-       "te_IN"

-     ],

- 

-     "postprocess-script": "treecompose-post.sh",

- 

-     "etc-group-members": ["wheel", "docker"],

- 

-     "ignore-removed-users": ["root"],

-     "ignore-removed-groups": ["root"],

-     "check-passwd": { "type": "file", "filename": "passwd" },

-     "check-groups": { "type": "file", "filename": "group" },

- 

-     "packages": ["atomic",

-          "glibc", "nss-altfiles", "shadow-utils",

-          "sssd-client", "libsss_sudo",

-          "fedora-release-atomichost",

-          "dracut-config-generic", "kernel",

-          "dracut-network",

-          "rpm-ostree", "lvm2",

-          "chrony",

-          "cryptsetup",

-          "authconfig",

-          "btrfs-progs", "e2fsprogs", "xfsprogs",

-          "gnupg2",

-          "basesystem",

-          "python",

-          "bash",

-          "xz", "gzip", "bzip2",

-          "coreutils",

-          "bridge-utils",

-          "which",

-          "nfs-utils",

-          "curl",

-          "iptables-services", "iptables",

-          "NetworkManager",

-          "dnsmasq",

-          "hostname", "initscripts", "iproute", "iputils", "less",

-          "sos",

-          "openssh-clients", "openssh-server", "passwd",

-          "policycoreutils", "procps-ng", "rootfiles", "rpm",

-          "selinux-policy-targeted", "setup", "shadow-utils",

-          "sudo", "systemd", "util-linux", "vim-minimal",

-          "less",

-          "tar",

-          "cloud-init",

-          "cloud-utils-growpart",

-          "rsync",

-          "bash-completion",

-          "tmux", "screen",

-          "strace", "lsof", "tcpdump", "nmap-ncat",

-          "policycoreutils-python",

-          "policycoreutils-python-utils",

-          "setools-console",

-          "audit",

-          "cockpit-bridge",

-          "cockpit-system",

-          "cockpit-docker",

-          "cockpit-networkmanager",

-          "cockpit-ostree",

-          "docker",

-          "python-docker-py",

-          "iscsi-initiator-utils",

-          "glusterfs", "glusterfs-fuse",

-          "ceph-common",

-          "oddjob-mkhomedir",

-          "oci-register-machine",

-          "oci-systemd-hook",

-          "mdadm",

-          "runc",

-          "attr"],

- 

-     "packages-aarch64": ["grub2-efi", "ostree-grub2",

-                          "efibootmgr", "shim", "atomic-devmode"],

- 

-     "packages-armhfp": ["extlinux-bootloader"],

- 

-     "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],

- 

-     "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],

- 

-     "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",

-                          "efibootmgr", "shim", "atomic-devmode",

-                          "microcode_ctl"],

- 

-     "default_target": "multi-user.target",

- 

-     "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"]

+     "include": "fedora-atomic-host-base.json"

  }

actually let me think about this one for a minute.

i'm trying to figure out if what we are doing here will mess up what we are doing in the nightly branched compose or not. WDYT?

@dustymabe I don't think so: if you use the atomic-host.json, the resulting tree file should be exactly identical to the one previously generated.

rebased onto bdd1f47

6 years ago

Pull-Request has been merged by dustymabe

6 years ago