lp://qastaging/~mvo/snappy/15.04-systemd-sockets
- Get this branch:
- bzr branch lp://qastaging/~mvo/snappy/15.04-systemd-sockets
Branch merges
- John Lenton (community): Approve
-
Diff: 386 lines (+218/-35)5 files modifieddocs/meta.md (+4/-0)
snappy/click.go (+73/-15)
snappy/click_test.go (+58/-3)
snappy/snapp.go (+7/-0)
systemd/systemd.go (+76/-17)
- Snappy Developers: Pending requested
-
Diff: 6555 lines (+5232/-42) (has conflicts)74 files modified_integration-tests/README.md (+117/-0)
_integration-tests/data/snaps/basic/meta/package.yaml (+4/-0)
_integration-tests/data/snaps/basic/meta/readme.md (+3/-0)
_integration-tests/data/snaps/missing-readme/meta/package.yaml (+4/-0)
_integration-tests/data/snaps/wrong-yaml/meta/package.yaml (+5/-0)
_integration-tests/data/snaps/wrong-yaml/meta/readme.md (+3/-0)
_integration-tests/data/tpl/control (+4/-0)
_integration-tests/main.go (+105/-0)
_integration-tests/reboot-wrapper (+35/-0)
_integration-tests/tests/apt_test.go (+39/-0)
_integration-tests/tests/base_test.go (+29/-0)
_integration-tests/tests/build_test.go (+90/-0)
_integration-tests/tests/failover_rclocal_crash_test.go (+54/-0)
_integration-tests/tests/failover_systemd_loop_test.go (+114/-0)
_integration-tests/tests/failover_test.go (+58/-0)
_integration-tests/tests/failover_zero_size_file_test.go (+258/-0)
_integration-tests/tests/info_test.go (+79/-0)
_integration-tests/tests/installApp_test.go (+128/-0)
_integration-tests/tests/installFramework_test.go (+93/-0)
_integration-tests/tests/list_test.go (+78/-0)
_integration-tests/tests/rollback_test.go (+53/-0)
_integration-tests/tests/search_test.go (+44/-0)
_integration-tests/tests/update_test.go (+51/-0)
_integration-tests/tests/writablePaths_test.go (+106/-0)
_integration-tests/testutils/autopkgtest/autopkgtest.go (+111/-0)
_integration-tests/testutils/autopkgtest/ssh.go (+46/-0)
_integration-tests/testutils/build/build.go (+76/-0)
_integration-tests/testutils/common/common.go (+379/-0)
_integration-tests/testutils/common/common_test.go (+68/-0)
_integration-tests/testutils/config/config.go (+75/-0)
_integration-tests/testutils/config/config_test.go (+121/-0)
_integration-tests/testutils/image/image.go (+86/-0)
_integration-tests/testutils/testutils.go (+61/-0)
cmd/snappy/cmd_internal_unpack.go (+4/-0)
cmd/snappy/cmd_internal_unpack_test.go (+20/-0)
cmd/snappy/cmd_rollback.go (+9/-0)
cmd/snappy/cmd_set.go (+14/-0)
cmd/snappy/cmd_set_test.go (+18/-1)
cmd/snappy/main.go (+4/-0)
debian/control (+9/-0)
debian/rules (+9/-0)
debian/snappy-wait4network.service (+10/-0)
dependencies.tsv (+5/-0)
etc/grub.d/09_snappy.OTHER (+441/-0)
helpers/helpers.go (+170/-8)
helpers/helpers_test.go (+104/-0)
logger/logger_test.go (+331/-0)
partition/bootloader_grub.go (+20/-0)
partition/bootloader_grub_test.go (+5/-0)
partition/bootloader_uboot.go (+343/-0)
partition/bootloader_uboot_test.go (+90/-0)
partition/partition.go (+20/-0)
run-checks (+19/-0)
snappy/auth_test.go (+12/-12)
snappy/build_test.go (+5/-0)
snappy/click.go (+311/-0)
snappy/click_test.go (+85/-0)
snappy/common_test.go (+7/-1)
snappy/dirs.go (+9/-0)
snappy/errors.go (+23/-0)
snappy/firstboot_test.go (+4/-0)
snappy/install_test.go (+5/-0)
snappy/parts.go (+47/-1)
snappy/remove_test.go (+4/-0)
snappy/rollback_test.go (+4/-0)
snappy/security.go (+7/-0)
snappy/security_test.go (+4/-0)
snappy/snapp.go (+110/-2)
snappy/snapp_test.go (+146/-17)
snappy/sort_test.go (+4/-0)
snappy/systemimage.go (+36/-0)
snappy/systemimage_test.go (+58/-0)
snappy/udev_test.go.OTHER (+49/-0)
systemd/systemd.go (+80/-0)
Branch information
Recent revisions
- 467. By Michael Vogt
-
Allows hwassign/unassign for /sys/class/
gpio/{, un}export to fix lp1488618 by mvo approved by jdstrand - 465. By Leo Arias
-
Backported the change to use gopkg.in/check.v1. by elopio approved by sergiusens,fgimenez
- 463. By Michael Vogt
-
Another missing uboot piece to move from uEnv.txt to uboot.env. I will do some more cleanup in trunk, i.e. I dislike that there is no single bootvar etc. by mvo approved by rsalveti
- 462. By Michael Vogt
-
Set snappy_trial_boot to "0" instead of unsetting it
he reason is that uboot is acting really funny when vars are unset.
I.e. "if "${snappy_trial_boot} " = "1"; then echo yes; fi" will echo yes
if snappy_trial_boot is unset on older u-boot systems (e.g. odroid).Only changing uboot in 15.04 (not grub as we do in wily). by mvo approved by mvo,chipaca
- 460. By Sergio Schvezov
-
Only update bootloader files on newer versions or channel changes. by sergiusens approved by mvo
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)