Merge ~rhansen/ubuntu/+source/initramfs-tools:generated-by-comment into ubuntu/+source/initramfs-tools:ubuntu/devel

Proposed by Richard Hansen
Status: Needs review
Proposed branch: ~rhansen/ubuntu/+source/initramfs-tools:generated-by-comment
Merge into: ubuntu/+source/initramfs-tools:ubuntu/devel
Diff against target: 28 lines (+9/-0)
2 files modified
debian/changelog (+6/-0)
scripts/functions (+3/-0)
Reviewer Review Type Date Requested Status
Steve Langasek Pending
git-ubuntu developers Pending
Review via email: mp+382550@code.launchpad.net
To post a comment you must log in.
7f599b3... by Ben Hutchings

Import patches-unapplied version 0.137 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 57216af3f25f1f18f09f915d1c3e5799772d1a63

New changelog entries:
  [ Ben Hutchings ]
  * [1b28d25] Document copy_exec as usable for shared libraries
  * [f2ac13e] hook-functions: copy_exec: Copy libgcc_s.so.1 along with
    libpthread.so.* (Closes: #950254)
  * [d96228a] hook-functions: copy_exec: Correct verbose log message for
    symlinks
  * [dd5fb36] hook-functions: Factor out device class walking into a function
  * [14a00af] hook-functions: Don't add backlight modules if we have generic
    fb device (Closes: #955347)
  * [f6133e1] Fix new shellcheck warnings around unquoted parameter expansion
    (Closes: #958851)
  [ AP ]
  * [857042c] hook-functions: Search for firmware under /lib/firmware/updates
    (Closes: #956663)

ebec39e... by Gianfranco Costamagna

0.137ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

bac1590... by Gianfranco Costamagna

0.137ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

359f422... by Dimitri John Ledkov

0.137ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

76f57d4... by Gianfranco Costamagna

0.137ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

Revision history for this message
Richard Hansen (rhansen) wrote :

Friendly ping.

Unmerged commits

241eab2... by Richard Hansen

Add a "generated by" comment to /run/netplan/*.yaml

This makes it easier for users to figure out why their desired network
configuration is being ignored (e.g., https://askubuntu.com/q/1228433).

76f57d4... by Gianfranco Costamagna

0.137ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

359f422... by Dimitri John Ledkov

0.137ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

bac1590... by Gianfranco Costamagna

0.137ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

ebec39e... by Gianfranco Costamagna

0.137ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

7f599b3... by Ben Hutchings

Import patches-unapplied version 0.137 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 57216af3f25f1f18f09f915d1c3e5799772d1a63

New changelog entries:
  [ Ben Hutchings ]
  * [1b28d25] Document copy_exec as usable for shared libraries
  * [f2ac13e] hook-functions: copy_exec: Copy libgcc_s.so.1 along with
    libpthread.so.* (Closes: #950254)
  * [d96228a] hook-functions: copy_exec: Correct verbose log message for
    symlinks
  * [dd5fb36] hook-functions: Factor out device class walking into a function
  * [14a00af] hook-functions: Don't add backlight modules if we have generic
    fb device (Closes: #955347)
  * [f6133e1] Fix new shellcheck warnings around unquoted parameter expansion
    (Closes: #958851)
  [ AP ]
  * [857042c] hook-functions: Search for firmware under /lib/firmware/updates
    (Closes: #956663)

57216af... by Ben Hutchings

Import patches-unapplied version 0.136 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 42dd22db1f2197e9dee4ef8c3e4131cc696951db

New changelog entries:
  [ Mathieu Malaterre ]
  * [90bd459] Update to new name for kernel module therm_pm72
  [ Alper Nebi Yasak ]
  * [ded7214] hook-functions: Handle dw_mmc-rockchip hidden dependency on
    rockchip-io-domain
  * [da85190] hook-functions: Include modules for Chromebook Plus display
  [ Ben Hutchings ]
  * [afd2668] debian/tests/control: Mark shellcheck test as superficial
  * [9d8b690] mkinitramfs: Remove workaround for old udev versions
  * [2b55aca] mkinitramfs: Remove special case for Arm OABI ports
  * [a9e5169] mkinitramfs: Remove armhf dynamic linker hack
  * [b19b6f3] debian/rules: Suppress execution of dh_installinitramfs
  * [8330bcd] mkinitramfs: Use cp -p option for ld.so.conf* instead of -aZ
  * [15fd713] initramfs-tools(7): Change example to use copy_exec instead of cp
  * [c2d589e] Revert "mkinitramfs: check if initramfs has a shell"
  * [835d584] mkinitramfs: Copy modules.builtin.bin into initramfs
    (Closes: #948257)
  * [0012977] init: Remove special case for kernel parameter resume=UUID=...
  * [897ab77] update-initramfs: Make "-c -k all" options useful again
    (Closes: #926401)
  * [d6c6eec] init: Mount /dev with "exec" option if v86d is present
    (Closes: #940171)
  * [a9e73b5] hook-functions: Drop ext4dev from filesystem module list
  * [41d9ceb] mkinitramfs: Enable multihreaded xz compression (Closes: #942144)
  [ Alexander Volkov ]
  * [e34affa] Don't require build dependency on shellcheck when nocheck profile
    is enabled
  [ Johannes 'josch' Schauer ]
  * [e2ad678] hook-functions: preloaded libraries should not end up in the
    initramfs (Closes: #944929)
  [ Debian Janitor ]
  * [a1e17fc] Bump debhelper from old 9 to 12.
  * [4d86d1a] Set debhelper-compat version in Build-Depends.
  [ Romain Perier ]
  * [4df27e2] hook-functions: Add f2fs as base in auto_add_modules
  [ Christian Göttsche ]
  * [0db5752] Do not copy SELinux context in mkinitramfs (Closes: #948365)
  [ Topi Miettinen ]
  * [55afeec] Tighten permissions for /run/initramfs

42dd22d... by Ben Hutchings

Import patches-unapplied version 0.135 to debian/sid

Imported using git-ubuntu import.

Changelog parent: fde9b7b5c6f73299d55062c8fe8c53b94f84ed72

New changelog entries:
  [ Topi Miettinen ]
  * [eb98d2e] init: /dev can be noexec and /run nodev
  [ Alper Nebi Yasak ]
  * [43488a3] hook-functions: Handle spi-rockchip hidden dependency on pl330
  [ Ben Hutchings ]
  * [116ce5c] autopkgtest: Only test hook and boot scripts from specific
    packages

fde9b7b... by Ben Hutchings

Import patches-unapplied version 0.134 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7e0819db40757e0677e9d2d9a1357237e8a97169

New changelog entries:
  [ Ben Hutchings ]
  * [8aeae9f] hooks/resume: Disable resume when there are no suitable swap
    devices. Thanks to Trek <email address hidden> (Closes: #916696)
  * [40f6647] hook-functions: Include all keyboard driver modules when
    MODULES=most. Thanks to Alper Nebi Yasak <email address hidden>
  * [797e5fe] hook-functions: Include cros_ec_spi and SPI drivers when
    MODULES=most. Thanks to Alper Nebi Yasak <email address hidden>
  * [f65627d] resume: Set plymouth status only if there is a suspend image
    (Closes: #928736)
  * [c31a908] hook-functions: Fix copy_file with target of "/bin"
    (Closes: #928689)
  * [8a29ef3] scripts/functions: Use "reboot -f" to reboot on panic.
    Thanks to Michael Niewöhner <email address hidden> (Closes: #923165)
  * [da9f53e] unmkinitramfs: Work around lz4cat filename check.
    Thanks to Dimitri John Ledkov <email address hidden> (Closes: #930366)
  * [cf7bb4b] initramfs-tools-core: Depend on logsave or older e2fsprogs
    (Closes: #932854)
  * [8570718] update-initramfs(8): Document -d option as "delete" instead of
    "remove"
  * [fffe514] update-initramfs(8): Update description of "-k all" option
  [ Benjamin Drung ]
  * [5e94f22] autopkgtest: Check also
    /usr/share/initramfs-tools/{hooks,scripts}
  [ Alper Nebi Yasak ]
  * [994d698] hook-functions: Include extcon-usbc-cros-ec when MODULES=most
  * [4e3496a] hook-functions: Include extcon drivers when MODULES=dep
  [ Uwe Kleine-König ]
  * [37dcf3d] mkinitramfs: suppress warning when using bzip2 or lzma
    (Closes: #930754)

7e0819d... by Ben Hutchings

Import patches-unapplied version 0.133 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 28b1e0bfe6ec684cdf5c091f8aae3fb1250b0a51

New changelog entries:
  [ Ben Hutchings ]
  * [942f1d2] unmkinitramfs, lsinitramfs: Avoid zcat compatibility issue by
    running gzip (Closes: #903931)
  * [94683ef] mkinitramfs: Remove check for kernel version < 2.6.38
  * [40fb032] mkinitramfs; Stop setting both compress and COMPRESS variables
  * [01af757] initramfs-tools: Change trigger declaration to "interest-await"
  * [2bb6a9c] update-initramfs: Remove test for working dpkg-trigger
  * [1f10559] kernel hooks: Remove use of update-initramfs -t option
  * [1343b68] update-initramfs: Remove undocumented -y option
  * [e0d4024] mkinitramfs: Warn if the compression command is not recognised
  * [bafb9d4] init: Always export the resume and noresume variables, as
    documented
  * [f21fdae] debian/rules: Use a more conservative "find" for shellcheck
    arguments
  * [9c63564] Change get_fstype to be silent on failure
  * [58df6d3] scripts/functions: Abort _checkfs_once early if fs type is
    unknown
  * [f8ceeb9] scripts/local: Explicitly check for missing root parameter and
    mount failure. Thanks to "G.raud" <email address hidden> (Closes: #848906)
  * [a5ae8a1] scripts/{local,nfs}: Remove redundant modprobe of filesystem
    modules
  * [4807ede] hook-functions: Avoid symlinks that conflict with usr-merge in
    copy_file
  * [79f49b9] {hooks,scripts}/keymap: Use setupcon --setup-dir
  * [839be1b] scripts/local: Handle rootfstype=auto the same as if type is
    unspecified (Closes: #908967)
  * [f086b72] mkinitramfs: Use default compression level for lzop
    (Closes: #916935)
  * [d343f5e] README: Summarise what initramfs-tools does and point to manual
    pages
  * [c5dd80a] initramfs-tools(7): Document how to update the initramfs from
    another package (Closes: #893897)
  * [2e5e389] scripts/functions: Revert change to _log_msg and make callers
    format-safe
  * [49139ca] scripts/local-premount/resume: Report when we are resuming.
    Thanks to Mario Limonciello <email address hidden>
  * [28b9d1d] scripts/nfs: Use "sleep" instead of /bin/sleep (Closes: #677049)
  * [db394d3] Print warnings and errors in initramfs generation consistently
  * [d9cf2f2] hooks/fsck: If get_fstype fails, report which file system it
    failed for (Closes: #766446)
  * [1ae0994] mkinitramfs: Change EXTRA_CONF to include directory names
  * [34f84b4] mkinitramfs: Don't add directories to EXTRA_CONF
  * [db31e7e] mkinitramfs: Use pigz if available instead of gzip
  * [e4a5589] initramfs-tools-core: Recommend pigz
  * [b8d3d59] Remove descriptions of removed/deprecated options from man page
    synopses
  * [4d57f63] mkinitramfs(8), update-initramfs(8): Fix over-indentation of
    options
  * [66902db] update-initramfs(8): Fix formatting of mode options in the
    synopsis
  * [bb9d247] Move usage function for mkinitramfs out of hook-functions
  * [2380cb8] update-initramfs: Use getopt instead of getopts
  * [abca193] update-initramfs: Make -h option return 0 and write usage to
    stdout
  * [ccf07ee] update-initramfs: Support --help option
  * [c800321] Make all commands return 2 in case of a usage error
  * [fc81f7f] mkinitramfs: Support -h and --help options
  * [94e05dd] unmkinitramfs(8): Abbreviate synopsis to avoid wrapping
  * [00809d7] Make manual pages and usage messages more consistent
  * [45f4d15] unmkinitramfs: Write usage on stderr in case of error
  * [908bd7d] lsinitramfs, mkinitramfs, unmkinitramfs: Show usage if getopt
    fails
  * [1cc6e78] lsinitramfs: Check for empty list of arguments after parsing
    options
  * [fb3ea62] hooks/resume: Report in excruciating detail if the -v option is
    used
  [ Benjamin Drung ]
  * [806c757] scripts/functions: Fix syntax error: unexpected "(" on panic
  * [88b0c9b] mkinitramfs: Fix termination of gzip compression case
  * [5438f31] scripts/functions: Drop render function
  * [3c8b4c3] Remove trailing newline from debian/changelog
  * [f277309] Fix (nearly) all issues found by shellcheck
  * [2bab73b] Disable shellcheck for desired behaviour
  * [3650731] Replace 'echo -n' by printf
  * [9c0feb2] Run shellcheck on package build time
  * [c9cb0a0] Add autopkgtest for shellcheck

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 08d064c..23ec7fe 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+initramfs-tools (0.137ubuntu7) groovy; urgency=medium
7+
8+ * Add a "generated by" comment to /run/netplan/*.yaml.
9+
10+ -- Richard Hansen <rhansen@rhansen.org> Thu, 28 May 2020 12:29:31 -0400
11+
12 initramfs-tools (0.137ubuntu6) groovy; urgency=medium
13
14 * Fixup previous commit to fix build failure
15diff --git a/scripts/functions b/scripts/functions
16index 404fb29..23d12c0 100644
17--- a/scripts/functions
18+++ b/scripts/functions
19@@ -539,6 +539,9 @@ _render_netplan() {
20 if [ -n "$vlink" ]; then
21 name=$vlink
22 fi
23+ echo "# Generated by initramfs-tools. The purpose of this file is to"
24+ echo "# keep the interface configuration stable during boot in case"
25+ echo "# a critical mount uses a network filesystem."
26 echo "network:"
27 echo " version: 2"
28 echo " ethernets:"

Subscribers

People subscribed via source and target branches