From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2575E158020 for ; Tue, 15 Nov 2022 02:52:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56497E0997; Tue, 15 Nov 2022 02:52:14 +0000 (UTC) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 031B6E0991; Tue, 15 Nov 2022 02:52:13 +0000 (UTC) Received: by mail-qv1-f51.google.com with SMTP id e15so9035009qvo.4; Mon, 14 Nov 2022 18:52:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMJ2IQmR2DrCD15zTCz8XFDwFKZUPNJJKnCfMVdRwr0=; b=c2dP8BwwVSZa2sUasiCuemenAvdz3XtK8a9whusNE5bXLB/YVPe/6zOfSmUf3JNFz1 Zj5ya8sC++5VM8LsVVijI9fiW1r28m05R1uo7VhYSgk7Y0Qd5d4NCGUaMC7J9Kvw29Gu oo63RRPQkzKXxuypmgtutRshq/9sL/JNaoSM66D9RA4+W7AzhH/SOUPHInnd+eD1NphJ dpRbYjVEBLSpNqnPoLuVlGLMVToeuSezkX49yibV/Wxt4bPuCFLyKzWvkG/k5UHY4/7J khu01kWI30zzLw5KytweVH8jj+5gaV1O/hOHDLwty4QG1VFs/x21Y7BezRQX049eH5hT NKnA== X-Gm-Message-State: ANoB5pkzy044HoLbe+ZxudOcBC3+2hEdswvzlx7LWAPPNhfIVgntqby8 8NTePfLz0y7kCAThucO1oc/+vmrBZxo= X-Google-Smtp-Source: AA0mqf5F+EL9Y5Bt2cBjMrESE+v67t1jylyCaFg1MKR0qgmpnIFx3QhAnCmz5DISFhFy+w8sw74sXw== X-Received: by 2002:a0c:f909:0:b0:4b8:361:4ca with SMTP id v9-20020a0cf909000000b004b8036104camr15120646qvn.102.1668480732947; Mon, 14 Nov 2022 18:52:12 -0800 (PST) Received: from localhost ([162.208.5.36]) by smtp.gmail.com with ESMTPSA id q45-20020a05620a2a6d00b006ee7923c187sm7663701qkp.42.2022.11.14.18.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 18:52:12 -0800 (PST) From: Matt Turner To: gentoo-dev@lists.gentoo.org, gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-dev] [PATCH 3/5] targets: Remove gconf usage Date: Mon, 14 Nov 2022 21:51:55 -0500 Message-Id: <20221115025157.1703859-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221115025157.1703859-1-mattst88@gentoo.org> References: <20221115025157.1703859-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 602eebf9-21f4-4814-b013-795f4dacb509 X-Archives-Hash: e0a30325f0531b3dcb95418772bcb810 Bug: https://bugs.gentoo.org/873841 Signed-off-by: Matt Turner --- livecd/files/livecd-local.start | 5 ----- targets/support/livecdfs-update.sh | 24 ------------------------ 2 files changed, 29 deletions(-) diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index 3615569c..a7bb2bef 100644 --- a/livecd/files/livecd-local.start +++ b/livecd/files/livecd-local.start @@ -4,11 +4,6 @@ # This is a good place to load any misc. # programs on startup ( 1>&2 ) -#if [ -d /usr/livecd/gconf ] -#then -# ln -sf /usr/livecd/gconf /etc/gconf -#fi - #if [ -d /usr/livecd/db ] #then # ln -sf /usr/livecd/db /var/db diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index cf2cf62f..b7548347 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -178,19 +178,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l # Post configuration case ${clst_livecd_type} in gentoo-release-live*) - # Setup Gnome theme - if [ "${clst_livecd_xsession}" == "gnome" ] - then - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /desktop/gnome/interface/font_name "Sans 9" - fi - - # Remove locking on screensaver - gconftool-2 --direct \ - --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s \ - -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null - # Setup GDM if [ "${clst_livecd_xdm}" == "gdm" ] then @@ -232,8 +219,6 @@ case ${clst_livecd_type} in mkdir -p /usr/livecd cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} - mv -f /etc/gconf /usr/livecd - ln -sf /usr/livecd/gconf /etc/gconf mv -f /var/db /usr/livecd ln -sf /usr/livecd/db /var/db @@ -274,15 +259,6 @@ case ${clst_livecd_type} in fi ;; generic-livecd ) - # This is my hack to reduce tmpfs usage - mkdir -p /usr/livecd - - if [ -d /etc/gconf ] - then - mv -f /etc/gconf /usr/livecd - ln -sf /usr/livecd/gconf /etc/gconf - fi - touch /etc/startx ;; esac -- 2.37.4