summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md19
-rw-r--r--packages/gce-disk-expand/README.md58
2 files changed, 22 insertions, 55 deletions
diff --git a/README.md b/README.md
index ed306f3..8dc7e49 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ Ubuntu 16.04 | deb | 3.5 or 2.7 | systemd
Ubuntu 18.04 | deb | 3.6 | systemd
Ubuntu 19.04 | deb | 3.7 | systemd
Debian 9 | deb | 3.5 or 2.7 | systemd
+Debian 10 | deb | 3.7 | systemd
We build the following packages for the Linux guest environment.
@@ -75,6 +76,12 @@ packaging directory for more details.
#### Version Updates
+Versions are described as 1:YYYYMMDD.NN-gN, meaning epoch 1 to denote from a
+distro maintained package which will be 0, a date string formatted as year,
+month, day, an incrementing minor release, and gN representing the Google
+package release. Debian, Ubuntu, and SUSE maintain distro packages which may be
+out of date, have different versioning, or naming.
+
The method for making version updates differs by package.
* All packages need the `VERSION` variable set in the `setup_{deb,rpm}.sh` build
@@ -102,11 +109,13 @@ Add the public repo key to your system:
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
```
-Add a source list file `/etc/apt/sources.list.d/google-cloud.list`:
+Add a source list file `/etc/apt/sources.list.d/google-cloud.list` and change
+`DIST` to either `stretch` for Debian 9 or `buster` for Debian 10:
```
+DIST=stretch
sudo tee /etc/apt/sources.list.d/google-cloud.list << EOM
-deb http://packages.cloud.google.com/apt google-compute-engine-stretch-stable main
-deb http://packages.cloud.google.com/apt google-cloud-packages-archive-keyring-stretch main
+deb http://packages.cloud.google.com/apt google-compute-engine-${DIST}-stable main
+deb http://packages.cloud.google.com/apt google-cloud-packages-archive-keyring-${DIST} main
EOM
```
@@ -119,8 +128,8 @@ You are then able to install any of the packages from this repo.
**For RedHat based distributions, run the following commands as root:**
-Add the yum repo to a repo file `/etc/yum.repos.d/google-cloud.repo` for either
-EL6 or EL7. Change `DIST` to either 6 or 7 respectively:
+Add the yum repo to a repo file `/etc/yum.repos.d/google-cloud.repo` for EL6,
+EL7, or EL8. Change `DIST` to either 6, 7, or 8 respectively:
```
DIST=7
tee /etc/yum.repos.d/google-cloud.repo << EOM
diff --git a/packages/gce-disk-expand/README.md b/packages/gce-disk-expand/README.md
index 276e790..f224ba5 100644
--- a/packages/gce-disk-expand/README.md
+++ b/packages/gce-disk-expand/README.md
@@ -1,53 +1,11 @@
-## gce-disk-expand package for CentOS/RHEL
+## gce-disk-expand package for CentOS/RHEL and Debian
-This package is intended to expand the root partition up to 2TB on a GCE VM. It
-consists of several scripts from other packages that for various reasons are not
-maintained by the distros; cloud-utils-growpart, dracut-modules-growroot, and an
-upstream version of the growpart script. See below for details. This package is
-included in GCE CentOS and RHEL images after v20160415.
+This package is intended to expand the root partition up to 2TB on a GCE VM
+without a GPT partition table and over 2TB on GPT partitioned UEFI enabled
+images.
-### Build the package
+This package has been tested on the following distros and versions.
-A script to build the package is provided for convenience.
-`./build_package.sh /OUTPUT_DIR` will yield an rpm and an srpm in the
-defined output directory for EL6 and EL7.
-
-### Package usage
-
-Install the gce-disk-expand package for your distro with yum and reboot:
-
-* CentOS/RHEL 6: `yum -y install /PATH_TO/gce-disk-expand-el6-VER-DATE.x86_64.rpm ; reboot`
-
-* CentOS/RHEL 7: `yum -y install /PATH_TO/gce-disk-expand-el7-VER-DATE.x86_64.rpm ; reboot`
-
-Your root partition will now be expanded to the full size of your disk up to
-2TB.
-
-#### Growpart
-
-The growpart script used in this package is not from the 0.27
-cloud-utils-growpart package. There are bugs in that version of growpart,
-primarily a bug that doesn't respect 2TB disk partitions on MBR disks. This
-means that if you had a disk that was 2.1TB, you would end up with a 0.1TB
-partition instead of 2TB partition. Obviously, this is bad. The upstream
-[cloud-utils 257 release](http://bazaar.launchpad.net/~cloud-utils-dev/cloud-utils/trunk/tarball/257)
-fixes this bug and others while not introducing more bugs and dependencies in
-further upstream releases of this script. It is therefore not recommended that
-you try to use the [0.27 growpart package](http://rpmfind.net/linux/RPM/epel/6/x86_64/cloud-utils-growpart-0.27-10.el6.x86_64.html)
-from the EPEL repo.
-
-#### Dracut module for EL6
-
-The dracut module is taken from the [dracut-modules-growroot](http://rpmfind.net/linux/RPM/epel/6/x86_64/dracut-modules-growroot-0.20-2.el6.noarch.html)
-package in the EPEL 6 repo. The dracut module allows the partition table to be
-expanded on boot before / is mounted and prevents an additional reboot in CentOS
-and RHEL 6. CentOS and RHEL 7 support live partition resizing by the kernel and
-do not need the dracut module.
-
-#### The expand-root script
-
-The expand-root script is derived from the
-[bootstrap-vz version](https://github.com/andsens/bootstrap-vz/blob/c682dab6ec51767b6e529c1589c5630f6295953a/bootstrapvz/common/assets/init.d/expand-root)
-of this script used for Debian instances. Essentially, it just calls the proper
-filesystem expansion utility to live resize the filesystem on first boot. The
-root partition is hard coded as /dev/sda1 in this script.
+* RHEL/CentOS 7.4+
+* RHEL 8+
+* Debian 10+