------------------------------------------------------------
revno: 61
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-04-11 12:10:05 +0100
message:
auto update
modified:
etc/init.d/icecast2
etc/init/kmod.conf
etc/init/maas-region-celery.conf
etc/init/maas-txlongpoll.conf
etc/init/neutron-vpn-agent.conf
etc/init/systemd-logind.conf
lib/systemd/systemd-hostnamed
lib/systemd/systemd-localed
lib/systemd/systemd-logind
lib/systemd/systemd-multi-seat-x
lib/systemd/systemd-timedated
lib/systemd/systemd-udevd
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init.d/icecast2'
--- etc/init.d/icecast2 2014-04-09 00:24:49 +0000
+++ etc/init.d/icecast2 2014-04-11 11:10:05 +0000
@@ -25,6 +25,8 @@
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
# Defaults
CONFIGFILE="/etc/icecast2/icecast.xml"
CONFIGDEFAULTFILE="/etc/default/icecast2"
=== modified file 'etc/init/kmod.conf'
--- etc/init/kmod.conf 2013-11-18 12:42:03 +0000
+++ etc/init/kmod.conf 2014-04-11 11:10:05 +0000
@@ -9,10 +9,16 @@
task
script
- [ -f /etc/modules ] || exit 0
+ [ -f /etc/modules ] && files="/etc/modules" || files=""
hash="#"
- while read module args; do
- [ -n "$module" ] && [ "${module#${hash}}" = "${module}" ] || continue
- modprobe $module $args || :
- done < /etc/modules
+ dirs="/etc/modules-load.d /run/modules-load.d /lib/modules-load.d"
+ for dir in $dirs; do
+ files="$files $(run-parts --list --regex='\.conf$' $dir 2> /dev/null || true)"
+ done
+ for file in $files; do
+ while read module args; do
+ [ -n "$module" ] && [ "${module#${hash}}" = "${module}" ] || continue
+ modprobe $module $args || :
+ done < $file
+ done
end script
=== modified file 'etc/init/maas-region-celery.conf'
--- etc/init/maas-region-celery.conf 2014-04-04 11:08:30 +0000
+++ etc/init/maas-region-celery.conf 2014-04-11 11:10:05 +0000
@@ -16,7 +16,7 @@
env DJANGO_SETTINGS_MODULE="maas.settings"
pre-start script
- if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1 ]; then
+ if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1; then
workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
/usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
/usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
=== modified file 'etc/init/maas-txlongpoll.conf'
--- etc/init/maas-txlongpoll.conf 2014-04-04 11:08:30 +0000
+++ etc/init/maas-txlongpoll.conf 2014-04-11 11:10:05 +0000
@@ -15,7 +15,7 @@
env longpoll_vhost="/maas_longpoll"
pre-start script
- if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1 ]; then
+ if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1; then
longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
/usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
/usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"
=== modified file 'etc/init/neutron-vpn-agent.conf'
--- etc/init/neutron-vpn-agent.conf 2014-04-04 11:08:30 +0000
+++ etc/init/neutron-vpn-agent.conf 2014-04-11 11:10:05 +0000
@@ -16,4 +16,5 @@
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
- --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
+ --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
+ --log-file=/var/log/neutron/vpn_agent.log
=== modified file 'etc/init/systemd-logind.conf'
--- etc/init/systemd-logind.conf 2013-11-18 12:42:03 +0000
+++ etc/init/systemd-logind.conf 2014-04-11 11:10:05 +0000
@@ -20,7 +20,8 @@
mount -t tmpfs -o uid=0,gid=0,mode=0755,size=1024 none /sys/fs/cgroup
fi
mkdir -p /run/systemd
- if ! mountpoint -q /sys/fs/cgroup/systemd; then
+ # mounting the cgroup does not work in LXC, there it uses cgmanager
+ if [ ! -e /run/container_type ] && ! mountpoint -q /sys/fs/cgroup/systemd; then
mkdir -p /sys/fs/cgroup/systemd
mount -t cgroup -o nosuid,noexec,nodev,none,name=systemd systemd /sys/fs/cgroup/systemd
fi
=== modified file 'lib/systemd/systemd-hostnamed'
Binary files lib/systemd/systemd-hostnamed 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-hostnamed 2014-04-11 11:10:05 +0000 differ
=== modified file 'lib/systemd/systemd-localed'
Binary files lib/systemd/systemd-localed 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-localed 2014-04-11 11:10:05 +0000 differ
=== modified file 'lib/systemd/systemd-logind'
Binary files lib/systemd/systemd-logind 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-logind 2014-04-11 11:10:05 +0000 differ
=== modified file 'lib/systemd/systemd-multi-seat-x'
Binary files lib/systemd/systemd-multi-seat-x 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-multi-seat-x 2014-04-11 11:10:05 +0000 differ
=== modified file 'lib/systemd/systemd-timedated'
Binary files lib/systemd/systemd-timedated 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-timedated 2014-04-11 11:10:05 +0000 differ
=== modified file 'lib/systemd/systemd-udevd'
Binary files lib/systemd/systemd-udevd 2014-04-09 00:26:24 +0000 and lib/systemd/systemd-udevd 2014-04-11 11:10:05 +0000 differ
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel