compose: Delete non-unified-core code

src/app/rpm-ostree-0-integration.conf

@@ -15,4 +15,10 @@ d /var/usrlocal/src 0755 root root -
 d /var/mnt 0755 root root -
 d /run/media 0755 root root -
 d /var/lib 0755 root root -
+# At some point ideally this moves into rpm; see
+# https://www.mail-archive.com/rpm-maint@lists.rpm.org/msg05421.html
 L /var/lib/rpm - - - - ../../usr/share/rpm
+# These were added more recently; TODO(walters) investigate
+# dropping them.
+L /var/lib/alternatives - - - - ../../usr/lib/alternatives
+L /var/lib/vagrant - - - - ../../usr/lib/vagrant

src/app/rpmostree-composeutil.c

@@ -96,59 +96,6 @@ rpmostree_composeutil_checksum (HyGoal             goal,
   return TRUE;
 }
 
-/* Prepare /dev in the target root with the API devices.  TODO:
- * Delete this when we implement https://github.com/projectatomic/rpm-ostree/issues/729
- */
-gboolean
-rpmostree_composeutil_legacy_prep_dev (int         rootfs_dfd,
-                                       GError    **error)
-{
-  GLNX_AUTO_PREFIX_ERROR ("Preparing dev (legacy)", error);
-
-  glnx_autofd int src_fd = openat (AT_FDCWD, "/dev", O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
-  if (src_fd == -1)
-    return glnx_throw_errno (error);
-
-  if (mkdirat (rootfs_dfd, "dev", 0755) != 0)
-    {
-      if (errno != ENOENT)
-        return glnx_throw_errno (error);
-    }
-
-  glnx_autofd int dest_fd = openat (rootfs_dfd, "dev", O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
-  if (dest_fd == -1)
-    return glnx_throw_errno (error);
-
-  static const char *const devnodes[] = { "null", "zero", "full", "random", "urandom", "tty" };
-  for (guint i = 0; i < G_N_ELEMENTS (devnodes); i++)
-    {
-      const char *nodename = devnodes[i];
-      struct stat stbuf;
-      if (!glnx_fstatat_allow_noent (src_fd, nodename, &stbuf, 0, error))
-        return FALSE;
-      if (errno == ENOENT)
-        continue;
-
-      if (mknodat (dest_fd, nodename, stbuf.st_mode, stbuf.st_rdev) != 0)
-        return glnx_throw_errno_prefix (error, "mknodat");
-      if (fchmodat (dest_fd, nodename, stbuf.st_mode, 0) != 0)
-        return glnx_throw_errno_prefix (error, "fchmodat");
-    }
-
-  { GLNX_AUTO_PREFIX_ERROR ("Testing /dev/null in target root (is nodev set?)", error);
-    glnx_autofd int devnull_fd = -1;
-    if (!glnx_openat_rdonly (dest_fd, "null", TRUE, &devnull_fd, error))
-      return FALSE;
-    char buf[1];
-    ssize_t s = read (devnull_fd, buf, sizeof (buf));
-    if (s < 0)
-      return glnx_throw_errno_prefix (error, "read");
-  }
-
-  return TRUE;
-}
-
-
 gboolean
 rpmostree_composeutil_sanity_checks (RORTreefile  *tf,
                                      JsonObject   *treefile,

src/app/rpmostree-composeutil.h

@@ -34,10 +34,6 @@ rpmostree_composeutil_checksum (HyGoal             goal,
                                 char             **out_checksum,
                                 GError           **error);
 
-gboolean
-rpmostree_composeutil_legacy_prep_dev (int         rootfs_dfd,
-                                       GError    **error);
-
 gboolean
 rpmostree_composeutil_sanity_checks (RORTreefile  *tf,
                                      JsonObject   *treefile,

src/libpriv/rpmostree-postprocess.c

@@ -469,195 +469,6 @@ process_kernel_and_initramfs (int            rootfs_dfd,
   return TRUE;
 }
 
-static gboolean
-convert_var_to_tmpfiles_d_recurse (GOutputStream *tmpfiles_out,
-                                   int            dfd,
-                                   RpmOstreePasswdDB *pwdb,
-                                   GString       *prefix,
-                                   GCancellable  *cancellable,
-                                   GError       **error)
-{
-  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
-  gsize bytes_written;
-
-  if (!glnx_dirfd_iterator_init_at (dfd, prefix->str + 1, TRUE, &dfd_iter, error))
-    return FALSE;
-
-  while (TRUE)
-    {
-      struct dirent *dent = NULL;
-      if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, cancellable, error))
-        return FALSE;
-      if (!dent)
-        break;
-
-      char filetype_c;
-      switch (dent->d_type)
-        {
-        case DT_DIR:
-          filetype_c = 'd';
-          break;
-        case DT_LNK:
-          filetype_c = 'L';
-          break;
-        case DT_REG:
-          /* nfs-utils in RHEL7; https://bugzilla.redhat.com/show_bug.cgi?id=1427537 */
-          if (g_str_has_prefix (prefix->str, "/var/lib/nfs"))
-            {
-              filetype_c = 'f';
-              break;
-            }
-          /* Fallthrough */
-        default:
-          if (!glnx_unlinkat (dfd_iter.fd, dent->d_name, 0, error))
-            return FALSE;
-          g_print ("Ignoring non-directory/non-symlink '%s/%s'\n",
-                   prefix->str,
-                   dent->d_name);
-          continue;
-        }
-
-      g_autoptr(GString) tmpfiles_d_buf = g_string_new ("");
-      g_string_append_c (tmpfiles_d_buf, filetype_c);
-      g_string_append_c (tmpfiles_d_buf, ' ');
-      g_string_append (tmpfiles_d_buf, prefix->str);
-      g_string_append_c (tmpfiles_d_buf, '/');
-      g_string_append (tmpfiles_d_buf, dent->d_name);
-
-      if (filetype_c == 'd' || filetype_c == 'f')
-        {
-          struct stat stbuf;
-          if (!glnx_fstatat (dfd_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW, error))
-            return FALSE;
-
-          g_string_append_printf (tmpfiles_d_buf, " 0%02o", stbuf.st_mode & ~S_IFMT);
-          const char *user = rpmostree_passwddb_lookup_user (pwdb, stbuf.st_uid);
-          if (!user)
-            return glnx_throw (error, "Failed to find user '%u' for %s", stbuf.st_uid, dent->d_name);
-          const char *group = rpmostree_passwddb_lookup_group (pwdb, stbuf.st_gid);
-          if (!group)
-            return glnx_throw (error, "Failed to find group '%u' for %s", stbuf.st_gid, dent->d_name);
-          g_string_append_printf (tmpfiles_d_buf, " %s %s - -", user, group);
-
-          if (filetype_c == 'd')
-            {
-              /* Push prefix */
-              gsize prev_len = prefix->len;
-              g_string_append_c (prefix, '/');
-              g_string_append (prefix, dent->d_name);
-
-              if (!convert_var_to_tmpfiles_d_recurse (tmpfiles_out, dfd, pwdb, prefix,
-                                                      cancellable, error))
-                return FALSE;
-
-              /* Pop prefix */
-              g_string_truncate (prefix, prev_len);
-            }
-        }
-      else
-        {
-          g_autofree char *link = glnx_readlinkat_malloc (dfd_iter.fd, dent->d_name, cancellable, error);
-          if (!link)
-            return FALSE;
-          g_string_append (tmpfiles_d_buf, " - - - - ");
-          g_string_append (tmpfiles_d_buf, link);
-
-        }
-
-      if (!glnx_unlinkat (dfd_iter.fd, dent->d_name,
-                          dent->d_type == DT_DIR ? AT_REMOVEDIR : 0, error))
-        return FALSE;
-
-      g_string_append_c (tmpfiles_d_buf, '\n');
-
-      if (!g_output_stream_write_all (tmpfiles_out, tmpfiles_d_buf->str,
-                                      tmpfiles_d_buf->len, &bytes_written,
-                                      cancellable, error))
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-convert_var_to_tmpfiles_d (int            rootfs_dfd,
-                           GCancellable  *cancellable,
-                           GError       **error)
-{
-  GLNX_AUTO_PREFIX_ERROR ("Converting /var to tmpfiles.d", error);
-
-  g_autoptr(RpmOstreePasswdDB) pwdb = rpmostree_passwddb_open (rootfs_dfd, cancellable, error);
-  if (!pwdb)
-    return FALSE;
-
-  glnx_autofd int var_dfd = -1;
-  /* List of files that are known to possibly exist, but in practice
-   * things work fine if we simply ignore them.  Don't add something
-   * to this list unless you've verified it's handled correctly at
-   * runtime.  (And really both in CentOS and Fedora)
-   */
-  const char *known_state_files[] = {
-    "lib/systemd/random-seed", /* https://bugzilla.redhat.com/show_bug.cgi?id=789407 */
-    "lib/systemd/catalog/database",
-    "lib/plymouth/boot-duration",
-    "log/wtmp", /* These two are part of systemd's var.tmp */
-    "log/btmp",
-  };
-
-  if (!glnx_opendirat (rootfs_dfd, "var", TRUE, &var_dfd, error))
-    return FALSE;
-
-  /* We never want to traverse into /run when making tmpfiles since it's a tmpfs */
-  /* Note that in a Fedora root, /var/run is a symlink, though on el7, it can be a dir.
-   * See: https://github.com/projectatomic/rpm-ostree/pull/831 */
-  if (!glnx_shutil_rm_rf_at (var_dfd, "run", cancellable, error))
-    return FALSE;
-
-  /* Here, delete some files ahead of time to avoid emitting warnings
-   * for things that are known to be harmless.
-   */
-  for (guint i = 0; i < G_N_ELEMENTS (known_state_files); i++)
-    {
-      const char *path = known_state_files[i];
-      if (unlinkat (var_dfd, path, 0) < 0)
-        {
-          if (errno != ENOENT)
-            return glnx_throw_errno_prefix (error, "unlinkat(%s)", path);
-        }
-    }
-
-  /* Convert /var wholesale to tmpfiles.d. Note that with unified core, this
-   * code should no longer be necessary as we convert packages on import.
-   */
-  g_auto(GLnxTmpfile) tmpf = { 0, };
-  if (!glnx_open_tmpfile_linkable_at (rootfs_dfd, "usr/lib/tmpfiles.d", O_WRONLY | O_CLOEXEC,
-                                      &tmpf, error))
-    return FALSE;
-  g_autoptr(GOutputStream) tmpfiles_out = g_unix_output_stream_new (tmpf.fd, FALSE);
-  if (!tmpfiles_out)
-    return FALSE;
-
-  g_autoptr(GString) prefix = g_string_new ("/var");
-  if (!convert_var_to_tmpfiles_d_recurse (tmpfiles_out, rootfs_dfd, pwdb, prefix, cancellable, error))
-    return FALSE;
-
-  if (!g_output_stream_close (tmpfiles_out, cancellable, error))
-    return FALSE;
-
-  /* Make it world-readable, no reason why not to
-   * https://bugzilla.redhat.com/show_bug.cgi?id=1631794
-   */
-  if (!glnx_fchmod (tmpf.fd, 0644, error))
-    return FALSE;
-
-  if (!glnx_link_tmpfile_at (&tmpf, GLNX_LINK_TMPFILE_NOREPLACE,
-                             rootfs_dfd, "usr/lib/tmpfiles.d/rpm-ostree-1-autovar.conf",
-                             error))
-    return FALSE;
-
-  return TRUE;
-}
-
 /* SELinux uses PCRE pre-compiled regexps for binary caches, which can
  * fail if the version of PCRE on the host differs from the version
  * which generated the cache (in the target root).
@@ -1025,14 +836,30 @@ rpmostree_postprocess_final (int            rootfs_dfd,
         return glnx_prefix_error (error, "SELinux postprocess");
     }
 
-  if (!convert_var_to_tmpfiles_d (rootfs_dfd, cancellable, error))
-    return FALSE;
-
   if (!rpmostree_rootfs_prepare_links (rootfs_dfd, cancellable, error))
     return FALSE;
   if (!rpmostree_rootfs_postprocess_common (rootfs_dfd, cancellable, error))
     return FALSE;
 
+  /* Clean out /var */
+  { g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
+
+    if (!glnx_dirfd_iterator_init_at (rootfs_dfd, "var", TRUE, &dfd_iter, error))
+      return FALSE;
+
+    while (TRUE)
+      {
+        struct dirent *dent = NULL;
+        if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
+          return FALSE;
+        if (!dent)
+          break;
+
+        if (!glnx_shutil_rm_rf_at (dfd_iter.fd, dent->d_name, cancellable, error))
+          return FALSE;
+      }
+  }
+
   g_print ("Adding rpm-ostree-0-integration.conf\n");
   /* This is useful if we're running in an uninstalled configuration, e.g.
    * during tests. */

tests/compose

@@ -42,17 +42,21 @@ test ${uid} = ${datadir_owner}
 
 # Create a consistent cache of the RPMs
 echo "Preparing compose tests... $(date)"
-tmp_repo=${test_compose_datadir}/tmp-repo
 if test -z "${RPMOSTREE_COMPOSE_CACHEONLY:-}"; then
     setup_rpmmd_repos ${dn}/composedata
+    mkdir -p ${test_compose_datadir}
+    tmp_repo=${test_compose_datadir}/tmp-repo
     ostree --repo=${tmp_repo} init --mode=bare-user
-    # Ensure all subsequent tests have the RPMs
+    # Download the RPMs and cache them in `fedora-local`;
+    # they're needed by the rojig e2e tests.
     mkdir -p ${test_compose_datadir}/{fedora-local,cache}
     rpm-ostree compose --repo=${tmp_repo} tree --download-only-rpms --cachedir=${test_compose_datadir}/cache ${dn}/composedata/fedora-base.json
     find ${test_compose_datadir}/cache/ -name '*.rpm' | while read f; do
-        mv $f ${test_compose_datadir}/fedora-local
+        ln $f ${test_compose_datadir}/fedora-local
     done
     (cd ${test_compose_datadir}/fedora-local && createrepo_c .)
+    # And also import the RPMs once
+    rpm-ostree compose --repo=${tmp_repo} tree --download-only --cache-only --cachedir=${test_compose_datadir} ${dn}/composedata/fedora-base.json
 fi
 echo "Done preparing compose tests! $(date)"
 rm ${tmp_repo} -rf

tests/compose-tests/libcomposetest.sh

@@ -60,16 +60,22 @@ with open(ofn, "w") as f:
 EOF
         export treefile=composedata/fedora-${name}.yaml
     fi
+    # The workdir will be cleaned up (or not) with the overall test dir
+    if ! [ -d cache ]; then
+        mkdir cache
+        ostree --repo=cache/pkgcache-repo init --mode=bare-user
+        echo 'fsync=false' >> cache/pkgcache-repo/config
+        # Clone the pkgcache
+        ostree --repo=cache/pkgcache-repo pull-local ${test_compose_datadir}/pkgcache-repo
+        # And copy everything else to avoid locking issues
+        cp -a --reflink=auto ${test_compose_datadir}/cache cache/cache
+    fi
 }
 
 composejson=$(pwd)/compose.json
-compose_workdir=${test_tmpdir}/workdir
-compose_base_argv="--workdir ${compose_workdir} --repo ${repobuild} --write-composejson-to ${composejson}"
+compose_base_argv="--cachedir=./cache --cache-only --repo ${repobuild} --write-composejson-to ${composejson}"
 runcompose() {
     echo "$(date): starting compose"
-    # The workdir will be cleaned up (or not) with the overall test dir
-    rm ${compose_workdir} -rf
-    mkdir ${test_tmpdir}/workdir
     env RPMOSTREE_PRESERVE_TMPDIR=1 rpm-ostree compose tree ${compose_base_argv} ${treefile} "$@"
     commit=$(jq -r '.["ostree-commit"]' < "${composejson}")
     ostree --repo=${repo} pull-local ${repobuild} "${treeref:-${commit}}"