Hi,
On 01/14/2015 04:34 AM, Ian McLeod wrote:
There are a few non-grub2 differences between these and the SIG master, but nothing that looks terribly significant. (diffs are at the bottom of this message).
I've composed a tree using an unmodified version of the current SIG git repo master and am hosting it here:
https://imcleod.fedorapeople.org/centos_atomic/atomic-repo/repo/
I've booted a copy of the most recent Atomic CentOS image (from Dec 5th), modified the remote to point to the tree above, and done an atomic upgrade. The resulting system happily boots the updated kernel via syslinux with the grub2 RPM present in-tree. (Logs below).
Thanks for looking into this,
-Ian
On 01/13/2015 12:28 PM, Karanbir Singh wrote:
hi,
This is the json file used to build the ostree repo at : http://buildlogs.centos.org/centos/7/atomic/x86_64/repo/
centos-atomic-cloud-docker-host.json { "include": "centos-atomic-base.json",
"ref": "centos/7/atomic/x86_64/cloud-docker-host", "packages": ["tuned", "man-db", "man-pages", "bash-completion", "rsync", "tmux", "net-tools", "nmap-ncat","bind-utils", "git","sysstat", "policycoreutils-python", "setools-console", "docker","audit", "cloud-init", "cloud-utils-growpart", "cockpit", "kubernetes", "etcd", "cadvisor", "flannel","centos-release-atomic"],
"units": ["docker.service", "cockpit.socket"]}
and centos-atomic-base.json { "comment": "CentOS 7 Base Atomic Defs",
"osname": "centos-atomic", "ref": "centos/7/atomic/x86_64/base", "repos": ["base", "updates," "extras," "atomic7-testing","virt7-testing"],
"selinux": true, "bootstrap_packages": ["filesystem", "glibc", "nss-altfiles","shadow-utils","centos-release", "kernel", "rpm-ostree", "lvm2"],
"packages": ["syslinux-extlinux", "e2fsprogs", "xfsprogs","selinux-policy-targeted", "audit","openssh-server", "openssh-clients", "sudo","passwd", "NetworkManager", "vim-minimal"],
"default_target": "multi-user.target"}
[root@atomic-imcleod sig-atomic-buildscripts]# diff -ur centos-atomic-base.json centos-atomic-base.json.kb --- centos-atomic-base.json 2015-01-14 06:07:51.858543314 +0000 +++ centos-atomic-base.json.kb 2015-01-14 06:10:06.009543314 +0000 @@ -3,20 +3,19 @@
"osname": "centos-atomic", "ref": "centos/7/atomic/x86_64/base",
- "repos": ["base", "updates," "extras," "atomic7-testing",
"virt7-testing"],
- "repos": ["base", "updates," "extras," "atomic7-testing",
+"virt7-testing"],
"selinux": true,
- "bootstrap_packages": ["filesystem", "glibc", "nss-altfiles",
"shadow-utils",
"centos-release", "kernel", "rpm-ostree","lvm2"],
- "bootstrap_packages": ["filesystem", "glibc", "nss-altfiles",
+"shadow-utils","centos-release", "kernel", "rpm-ostree", "lvm2"],
"packages": ["syslinux-extlinux", "e2fsprogs", "xfsprogs",
"selinux-policy-targeted", "audit","openssh-server", "openssh-clients", "sudo","passwd", "NetworkManager", "vim-minimal","grub2", "grub2-efi", "ostree-grub2", "lvm2" ],+"selinux-policy-targeted", "audit","openssh-server", "openssh-clients", +"sudo","passwd", "NetworkManager", "vim-minimal"],
- "default_target": "multi-user.target"
}
Missing from the .kb file
grub2, grub2-efi, ostree-grub2, lvm2, sudo, audit
lvm2, sudo and audit were already in there.
Maybe load into a py dictionary and sort, diff the json that way ?
For now, I've added in grub2, grub2-efi, ostree-grub2
- KB