lp:~smoser/cloud-init/lp-1015223
- Get this branch:
- bzr branch lp:~smoser/cloud-init/lp-1015223
Branch merges
Related bugs
Bug #1015223: cloud-init-nonet main process killed by TERM signal | Low | Fix Released |
Related blueprints
Branch information
Recent revisions
- 787. By Scott Moser
-
fix an issue where keys were not being parsed correctly
this fixes an issue where ssh keys were not being parsed correctly.
The result was that keys were considered to have options that did not
have options.Additionally, those options were being written rather than the disable_root
options. - 786. By Scott Moser
-
fix regression on expected label of filesystem for DataSourceNone
Last addition to DataSourceNoCloud left it looking for a filesystem
named 'None'. - 784. By Blair Zajac
-
Support resizing btrfs filesystems.
The existing code has two issues with btrfs:
1) The command to resize a btrfs filesystem uses a path to the mount
point, not the underlying device:$ btrfs filesystem resize max /dev/vda1
ERROR: unable to resize '/dev/vda1' - Inappropriate ioctl for device
Resize '/dev/vda1' of 'max'
$ btrfs filesystem resize max /
Resize '/' of 'max'2) The code that is given a path and finds the ID of the device where
the path is mounted doesn't work for btrfs:Use /proc/$$/mountinfo to find the device where path is mounted.
This is done because with a btrfs filesystem using os.stat(path)
does not return the ID of the device.Here, / has a device of 18 (decimal).
$ stat /
File: '/'
Size: 234 Blocks: 0 IO Block: 4096 directory
Device: 12h/18d Inode: 256 Links: 1
Access: (0755/drwxr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)
Access: 2013-01-13 07:31:04.358011255 +0000
Modify: 2013-01-13 18:48:25.930011255 +0000
Change: 2013-01-13 18:48:25.930011255 +0000
Birth: -Find where / is mounted:
$ mount | grep ' / '
/dev/vda1 on / type btrfs (rw,subvol=@,compress= lzo) And the device ID for /dev/vda1 is not 18:
$ ls -l /dev/vda1
brw-rw---- 1 root disk 253, 1 Jan 13 08:29 /dev/vda1So use /proc/$$/mountinfo to find the device underlying the input
path. - 783. By Scott Moser
-
do not reload upstart configuration on upstart jobs
For now, we disable reloading upstart jobs due to bug 1124384.
At some point in the future, we could enable it again when that
bug is fixed.The change here allows for a boothook in a multipart input to write the
file '/run/cloud-init-upstart- reload' and then have configuration
reloaded. - 782. By Vlastimil Holer
-
Few patches to make life on Debian 6 stable happier:
* Added arguments to packages/bddeb:
-d pass through '-d' to debuild
--no-cloud-utils don't depend on cloud-utils package (default: False)These are essential for building on Debian 6, because there are
no python-mocker (build dependency) and cloud-utils (install dependency)
in squeeze and squeeze-backports.* SysVinit startup scripts modified to run both on RHEL and Debian,
* (Unfortunately) New option INIT_SYSTEM=sysvinit_ deb for Debian /etc/init.d/
directory
* Make separate Ubuntu and Debian APT source template (cc_apt_configure)I'm now generating working Debian 6 package following way:
INIT_SYSTEM=sysvinit_ deb packages/bddeb -us -uc --no-cloud-utils -d - 781. By Scott Moser
-
DataSourceNoCloud: allow setting user-data and meta-data in config
This allows a single file to declare and activate this data source.
This could come from:
* cloud-config-url on kernel cmdline
* /etc/cloud/cloud.cfg. d
* debian preseed of 'cloud-init/local- cloud-config' Also here is
* some tests
* a small fix to parse_cmdline_data found when writing those tests. - 780. By harlowja <email address hidden>
-
Add initial docs about datasources.
Start moving the current README for
datasources to a RST format and include
those files in the rtd site.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~cloud-init-dev/cloud-init/trunk