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).

-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

[root@atomic-imcleod sig-atomic-buildscripts]# diff -ur centos-atomic-cloud-docker-host.json centos-atomic-cloud-docker-host.json.kb --- centos-atomic-cloud-docker-host.json 2015-01-14 06:07:51.858543314 +0000 +++ centos-atomic-cloud-docker-host.json.kb 2015-01-14 06:09:12.723543314 +0000 @@ -4,11 +4,11 @@ "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"], + "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"]

No real differences, only syntax.

Atomic upgrade dry run to prove grub2 peaceful coexistence with syslinux images:

[root@oslab-nib-vm2 atomic]# ssh centos@192.168.122.108 [centos@atomic-imcleod ~]$ sudo bash bash-4.2# rpm-ostree status TIMESTAMP (UTC) ID OSNAME REFSPEC

* 2014-12-05 18:09:42 41bd9679d8 centos-atomic-host centos-atomic-host:centos/7/atomic/x86_64/cloud-docker-host bash-4.2# grep url /etc/ostree/remotes.d/centos-atomic.conf url=https://imcleod.fedorapeople.org/centos_atomic/atomic-repo/repo/ bash-4.2# rpm-ostree upgrade Updating from: centos-atomic-host:centos/7/atomic/x86_64/cloud-docker-host

761 metadata, 3987 content objects fetched; 188472 KiB transferred in 183 seconds Copying /etc changes: 11 modified, 0 removed, 10 added Transaction complete; bootconfig swap: yes deployment count change: 1 Changed: NetworkManager-1:0.9.9.1-29.git20140326.4dba720.el7_0.x86_64 NetworkManager-glib-1:0.9.9.1-29.git20140326.4dba720.el7_0.x86_64 bind-libs-32:9.9.4-14.el7_0.1.x86_64 bind-libs-lite-32:9.9.4-14.el7_0.1.x86_64 bind-license-32:9.9.4-14.el7_0.1.noarch bind-utils-32:9.9.4-14.el7_0.1.x86_64 cockpit-0.27-1.el7.centos.x86_64 cockpit-assets-0.27-1.el7.centos.noarch docker-1.4.1-4.el7.x86_64 glibc-2.17-55.el7_0.3.x86_64 glibc-common-2.17-55.el7_0.3.x86_64 kernel-3.10.0-123.13.2.el7.x86_64 kubernetes-0.7.0-18.0.git52e165a.el7.x86_64 libgsystem-2015.1-1.el7.x86_64 libpcap-14:1.5.3-3.el7_0.1.x86_64 nss-3.16.2.3-2.el7_0.x86_64 nss-softokn-3.16.2.3-1.el7_0.x86_64 nss-softokn-freebl-3.16.2.3-1.el7_0.x86_64 nss-sysinit-3.16.2.3-2.el7_0.x86_64 nss-tools-3.16.2.3-2.el7_0.x86_64 nss-util-3.16.2.3-1.el7_0.x86_64 ostree-2015.2-1.el7.x86_64 rpm-4.11.1-18.el7_0.x86_64 rpm-libs-4.11.1-18.el7_0.x86_64 rpm-ostree-2015.2-1.el7.x86_64 selinux-policy-3.12.1-153.el7_0.13.noarch selinux-policy-targeted-3.12.1-153.el7_0.13.noarch wpa_supplicant-1:2.0-13.el7_0.x86_64 Added: centos-logos-70.0.6-1.el7.centos.noarch file-5.11-21.el7.x86_64 file-libs-5.11-21.el7.x86_64 flannel-0.1.0-8.gita7b435a.el7.x86_64 gettext-0.18.2.1-4.el7.x86_64 gettext-libs-0.18.2.1-4.el7.x86_64 grub2-1:2.02-0.2.10.el7.centos.1.x86_64 grub2-efi-1:2.02-0.2.10.el7.centos.1.x86_64 grub2-tools-1:2.02-0.2.10.el7.centos.1.x86_64 libcroco-0.6.8-5.el7.x86_64 libgomp-4.8.2-16.2.el7_0.x86_64 libunistring-0.9.3-9.el7.x86_64 os-prober-1.58-5.el7.x86_64 ostree-grub2-2015.2-1.el7.x86_64 which-2.20-7.el7.x86_64 Updates prepared for next boot; run "systemctl reboot" to start a reboot bash-4.2# systemctl reboot Connection to 192.168.122.108 closed by remote host. Connection to 192.168.122.108 closed. [root@oslab-nib-vm2 atomic]# ssh centos@192.168.122.108 [centos@atomic-imcleod ~]$ rpm -q docker docker-1.4.1-4.el7.x86_64 [centos@atomic-imcleod ~]$ rpm -q grub2 grub2-2.02-0.2.10.el7.centos.1.x86_64 [centos@atomic-imcleod ~]$ ls /boot ldlinux.sys loader loader.0 lost+found ostree syslinux [centos@atomic-imcleod ~]$ cat /proc/version Linux version 3.10.0-123.13.2.el7.x86_64 (builder@kbuilder.dev.centos.org) (gcc version 4.8.2 20140120 (Red Hat 4.8.2-16) (GCC) ) #1 SMP Thu Dec 18 14:09:13 UTC 2014 [centos@atomic-imcleod ~]$ rpm -q kernel kernel-3.10.0-123.13.2.el7.x86_64 [centos@atomic-imcleod ~]$