From 9f8d6be677bfd62181f2e54bfc39a044844a195e Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 12:10:58 -0400 Subject: add ChangeLog entry --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6d6da417..e06bf60f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,8 @@ avoid dependency on network metadata service on every boot (LP: #1553815) - support network configuration in cloud-init --local with support device naming via systemd.link. + - FreeBSD: add support for installing packages, setting password and + timezone. Change default user to 'freebsd'. [Ben Arblaster] 0.7.6: - open 0.7.6 -- cgit v1.2.3 From e3138283fa5f4c3c2579ee54c8a160fda2c17473 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 14:04:14 -0400 Subject: locale: list unsupported environment settings in warning Now if you log in with unsupported locale, you'll see: The unknown environment variables are: LC_CTYPE=en_GB.utf-8 LC_MESSAGES=en_GB.utf-8 LC_ALL=en_GB.utf-8 LP: #1558069 --- ChangeLog | 1 + tools/Z99-cloud-locale-test.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e06bf60f..805df93b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ device naming via systemd.link. - FreeBSD: add support for installing packages, setting password and timezone. Change default user to 'freebsd'. [Ben Arblaster] + - locale: list unsupported environment settings in warning (LP: #1558069) 0.7.6: - open 0.7.6 diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh index 3c51f22d..8e0469ed 100755 --- a/tools/Z99-cloud-locale-test.sh +++ b/tools/Z99-cloud-locale-test.sh @@ -10,7 +10,7 @@ # locale_warn() { - local bad_names="" bad_lcs="" key="" val="" var="" vars="" + local bad_names="" bad_lcs="" key="" val="" var="" vars="" bad_kv="" local w1 w2 w3 w4 remain # if shell is zsh, act like sh only for this function (-L). @@ -37,15 +37,18 @@ locale_warn() { [ "${bad}" = "${var%=*}" ] || continue val=${var#*=} [ "${bad_lcs#* ${val}}" = "${bad_lcs}" ] && - bad_lcs="${bad_lcs} ${val}" + bad_lcs="${bad_lcs} ${val}" + bad_kv="${bad_kv} $bad=$val" break done done bad_lcs=${bad_lcs# } + bad_kv=${bad_kv# } [ -n "$bad_lcs" ] || return 0 printf "_____________________________________________________________________\n" printf "WARNING! Your environment specifies an invalid locale.\n" + printf " The unknown environment variables are:\n %s\n" "$bad_kv" printf " This can affect your user experience significantly, including the\n" printf " ability to manage packages. You may install the locales by running:\n\n" @@ -76,7 +79,7 @@ locale_warn() { printf "\n" fi for bad in ${invalid}; do - printf "WARNING: '${bad}' is an invalid locale\n" + printf "WARNING: '${bad}' is an invalid locale\n" done printf "To see all available language packs, run:\n" -- cgit v1.2.3 From 3de63003f63801a046b2526b264caa92371d8e9f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 15:02:00 -0400 Subject: disk_setup: correctly send --force to mkfs on block devices Send the --force flag to mkfs or other filesystems when target is a block device. This fixes a general code flow issue where we were setting the --force flag. LP: #1548772 --- ChangeLog | 1 + cloudinit/config/cc_disk_setup.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 805df93b..df3f5f19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ - FreeBSD: add support for installing packages, setting password and timezone. Change default user to 'freebsd'. [Ben Arblaster] - locale: list unsupported environment settings in warning (LP: #1558069) + - disk_setup: correctly send --force to mkfs on block devices (LP: #1548772) 0.7.6: - open 0.7.6 diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index 0ecc2e4c..bbaf9646 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -847,9 +847,9 @@ def mkfs(fs_cfg): if label: fs_cmd.extend(["-L", label]) - # File systems that support the -F flag - if not fs_cmd and (overwrite or device_type(device) == "disk"): - fs_cmd.append(lookup_force_flag(fs_type)) + # File systems that support the -F flag + if overwrite or device_type(device) == "disk": + fs_cmd.append(lookup_force_flag(fs_type)) # Add the extends FS options if fs_opts: -- cgit v1.2.3 From cc77a528367b295b8033f73610143713c18a1bb9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 15:17:28 -0400 Subject: chef: fix chef installation from gems Installation from gems was previously always broken. This fixes the order or parameters calling install_chef_from_gems. LP: #1553345 --- ChangeLog | 1 + cloudinit/config/cc_chef.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index df3f5f19..3fade4db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ timezone. Change default user to 'freebsd'. [Ben Arblaster] - locale: list unsupported environment settings in warning (LP: #1558069) - disk_setup: correctly send --force to mkfs on block devices (LP: #1548772) + - chef: fix chef install from gems (LP: #1553345) 0.7.6: - open 0.7.6 diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index e18c5405..28711a59 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -285,7 +285,7 @@ def install_chef(cloud, chef_cfg, log): chef_version = util.get_cfg_option_str(chef_cfg, 'version', None) ruby_version = util.get_cfg_option_str(chef_cfg, 'ruby_version', RUBY_VERSION_DEFAULT) - install_chef_from_gems(cloud.distro, ruby_version, chef_version) + install_chef_from_gems(ruby_version, chef_version, cloud.distro) # Retain backwards compat, by preferring True instead of False # when not provided/overriden... run = util.get_cfg_option_bool(chef_cfg, 'exec', default=True) -- cgit v1.2.3 From 35802e8866be53016779f4f1eae9f026ccd18a61 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 16:07:07 -0400 Subject: systemd: do not specify After of obsolete syslog.target (LP: #1536964) syslog.target is obsolete in debian, this fixes a lintian warning. LP: #1536964 --- ChangeLog | 1 + systemd/cloud-config.service | 2 +- systemd/cloud-final.service | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 3fade4db..9fb6e6d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ - locale: list unsupported environment settings in warning (LP: #1558069) - disk_setup: correctly send --force to mkfs on block devices (LP: #1548772) - chef: fix chef install from gems (LP: #1553345) + - systemd: do not specify After of obsolete syslog.target (LP: #1536964) 0.7.6: - open 0.7.6 diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index 45d2a63b..3309e08a 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -1,6 +1,6 @@ [Unit] Description=Apply the settings specified in cloud-config -After=network-online.target cloud-config.target syslog.target +After=network-online.target cloud-config.target Wants=network-online.target cloud-config.target [Service] diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index bfb08d4a..3927710f 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -1,6 +1,6 @@ [Unit] Description=Execute cloud user/final scripts -After=network-online.target cloud-config.service syslog.target rc-local.service +After=network-online.target cloud-config.service rc-local.service Wants=network-online.target cloud-config.service [Service] -- cgit v1.2.3